# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20101027064047-ye93479yw0pw5yfe
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/
# testament_sha1: 9b258ee3f3b66e4d94326990643cb9865cbfecd6
# timestamp: 2010-10-27 09:40:55 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: sunny.bains@oracle.com-20101027063510-\
#   ba52egvp1x3mtkc3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdDGwNgAAaRflAAQUmf/91cm
eAC/7//wBAAIAFAD1O7ex573riN7dr3hJIiMRpT9TaeoNMk08TVM9KAPUPU9T1PUDJAh6JGwhUZB
pvSJ6T1DJ6jEABkk2KaIyZqZRgQAAAAADJEj0mTyjJoaA0NAAAAAElImjJ6mjCNGjao0wTJowgwA
m/Uc/gPnpagTHRTVALPZo1ndu5C0acooiDnkPN0HYt7UrjieeIdNl/CL6t1bp/SByjmg4/buj4PC
Btz0aXflp+G4fG1eKHMqU4vum7/pQSOcy6uXKdSqkhfxnrwFaRyvcPGMAtq+zaAD0jmLqPFEOFoC
olPTLJCwRlKEhR1AwCnMbkBVQuF7QoiAhg+CxfrMNAMdlhFqb2UqkWsI3nnw3kz6tO+KORWUZn5n
7rVedpds30VMLJ8izmZlpJro2NVF+bCkQvlLxBATx3biC2RMcq0r4T7WbEOZ5xDCu0XsqApnNlJv
D7XMg7tvhE/DOmlXAFxvQYyGGQFnB1h5JiLgLyz5S88ra1c3yG7gVjybALhdKBsFU9sjjRwAzcTh
hTUCNU42blbIYZolSoZratJNSBQ5sGDzfAGMSwXjKbL4nUbtTjZxduV8sMVF2RczNILr6AVNyWcG
iz5BwnISBitcSEjvymjp4NDFFGJQD4CFj6QlewRzxOEORS5ZszjJj0lRPF9yBET74vkRR14uXZ3w
fqy0sGjlERuDea1xVdR5nEDxnI7sdIKt7yPg1OA1zzwTOaLnCBqDG8WGSas0V5Xx5kxS+PUsVgn5
HWQ23BnXyXsOz2Ypq1iPJ1oTufAo8UPa6TEALTUA1+UNCMrdfARziXlLnAd1E9JrM1uow69YtKmM
tBt7k7F5pSAQOALE1Y/+t4gw6uFrxxYqgOEpQxe1ZYbCi9j027RyOV2AgmHmwe8AZJ/FoEAoUPCe
d9D3R11SRDIyJ0i8rL4RXlutVo9KD3j9hQdsLqGPVhnEyNWEq9MGqaoG3E3NOyuyzjD4ivMWNo9T
wmyVGjYnj6cO6uCiOU1rvthknR5aUS26VH7bXptKnA7QDWg1upBoNeBP2QTCKR1eBeLB9CTgKuBx
GYKZVbhdbRjGFYZR3F1ChiKIBokxiggKNdwP7EQOgvQZEMyZYRK3jWwD1QtYL8NIj44PjOwKUJlF
kepaZnZNjOerELhD2rZ9iXa/FTeAAxqlwYRS/qDw8ZuFyBI0TEbIsilCwGMzGxq8g0pXKREKRxpT
0IHAggF0pVaz6jcjnLMcELb6qNC9QIlEcXsMt6gW4idhpAQWXQFTmoGgRkaCuQGUHdCRaFviZYDF
XRpThUJoqdwslEtBjj3+S5H/i7kinChIaGNgbAA=