# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110406073449-7m4oxs8rtbpxgz31 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: bf1710462b23ee01c00b7caac455b6896d77778f # timestamp: 2011-04-06 10:35:07 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110406062236-\ # y11o0ddrwgxnvw8i # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWei3tW0AAljflAAwcmf//3cn KAS/7//wBAAIAFAE2JLx0OJw21taThJJNJkyaGjaQ2poZEyQDTQA0GgJSoYj1PSD9UZDQAAAAAAA SKAiNGTUBk0RozRqMmg0xGIPUHMABMmABMJgmEMARgASUJiA0J6IaEnoJpjU00aBoBoDQ0MaVkw4 uB346rGeHYTN/jgq6cePIosDjPOVZT1UjdGzDy+tsS81jbbXl91fKmcgh6CLjFz3W9+rn0Ee/q8u +cP7Qlh+JfO388HrbmtvIw9Yju9K0mqZIB6Rlrwtxrh64wO+PZ1gcP3fxOuqanwQSyOQ16yjLKZN efHZo9hvgzxcEL8i6CUwFJv7+Ueqwuy5ITszNuEsOglEtM9VCIpNDeMbsNaFyirzmPXKSFXaWCaR RUGBiW1ZMg00WxvVpLuFdU3lzK5YK5qCLOTZBC28+BtgP1VoT5XC2Jq5bnUvKiAdU7GiaubxFadn 87DMMFZUamuW9u5CtqM2UPWbMk6w4Tu0pOwREwvRu8WDGeIiUsWh1mtU1l/9Smqm0jmECQjLpMqV mJ5RA4cyWpuY/ZgWWTQqw12Ehyig3V1bX5gMLVoI4KwemNMQDo+rpC5TfLCEDWzoEVg0RyIUSMLA 2RFUQ264rbYkRYoXSIlpaY02iYSgVYVBsLICeWj6CkoYSFUcSIh92DoDRSyTRhK0NRI2gPg6wCt4 rI5EmkynJ9rrnF8z+LsAqL7YMi1mYGsV8XvFuM2mGmZDMxMS8pI1aOvpFXPFuDH1i0xVYA6uasRW x5xdh3LVt0hlvG9pGHB7jizi1iWTwK3DTbh4/FSqIpkfpqgP19/i/cdm9wXNwaN/qlTugptXNkDo kJnGKznOn2nSJWbZ+w19uAlTCCOYSx72EyjznXWlT+WCUQflTyeVZZO5NFyOR3GZ3Heb5rr9Yrpg dXH2HJLe0MRdvEnjaXnTMeLcLn1bhTFlROeeflqsmcwlrEoVS5HHNrcbc5EzWGUITg56G25oXCmV dxcKbFTvW1U0Ye+A5Y0yAG6ySfxsH3vWkl7jmRyFbOzGREai3TjXRU2PGbS2O+XRBofVx2SXXOty ZFsd1dlry+c3Fl1LHRyLKUPvdQLu3kemq84kpy4Cy0CGCw8zoKrS8YQNnhOGym+g2QaIH2W4Dl4R ieXaFcHuYrA6HG/tZdLBDNDMZHYtgFzlf0ol0OruXlt1za0UT4IzcpTDZATVXCX32IkSVA+aP9iF KHuEDuJYJMFFmPHHzXMmHxc+zhbIS8AKxvgJT0R5FyZDk4ViRxWnJomTWfLKurc7ENkiy+iISlEj zTF5p5eilOGTDAy7lDjjzc4S8FOFzQ0SJGmTgkt2YXy+UzP6iWdEFKCtfXyZdC7QOGRhrYwgrY5J 67qIx+AHYabTg2YxXAiGDq4JMK/S1UXXqABUp3vnQoviBCsaivFvKc2zipHWA+yyyM7217Mxw4QM qGWhm8DrRsuLmbVk7SOcWaj0YG738ipApQiyMKCeAwentowsDqpk5Thrsykb4lqK0UCg0Km6a+/m 4NGPFjXjee3pUBOuV7diN5QvBQXPEisQOKaAwR5C0ls5LeNowCvEkv8Qs/i7kinChIdFvato