# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100518131036-fdu5qpmvc75izeqs
# target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/
# testament_sha1: 209e9bee978499eb39df412373f51e42d2b453e0
# timestamp: 2010-05-18 16:10:59 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: jimmy.yang@oracle.com-20100517085742-\
#   kx3nqxrjbyxk5tkk
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTPcQwMAAehfgEAQWWv//1IC
BIC////wUARYvbrB16A2rbd1wkoSNR+k9TTSNin5KPQj1PUHqAaAYaSnkjCabU09T1NDBB6IMjRk
GQMk0I1PImk2JpkTJkGg9I00aAEiiGUyT9U9QyaZBpoaHlAAACSRGiYEwhPFMaKbTUxkTRoabUkt
tdl+Ke3wLNE8sO+i6QWeuRcEM6PbgrQBfJk+EG9RcQPMUil9D+Vo8XoiBeI+WzoKYOxse/OqVYi4
NGqfkM3FKtzv19YWNLJmxEObYO9+j1ROaBiBEGui/Pr03rW3sROvITdj3JG3tCkwPUsHA7c26drR
j4SKg5QV/MUaNkQrzLMnlVGWqawqplJGorEs0ioNqtKNL4dUTGSYFGZmKurKzqeSU2oSWNAz+Sgv
7RYqgmIxgI73zFkaCghZxqYkfBpchUHjFWEJMCLKkiYuw7YcDSgx/KS6KTOEJgEhsDmmvRUpAh4O
TIJD0GYdLYygGUiJcRMJVEZkeYPKLQ1kJqjEHhoIjupLtDrHSAZSTj7hrAoJBNMH0pFCm2mWUI0q
A7hxS/oGD1GRkZeSnzOVWW5EkmV8vrORwM2cJVm/IzKWwgd60k0LyDE9ApxdVHkZ1peVSqwvf34u
4rSVlIw8pPrgbzQvd0qbbstOAojAoUxKY0UY7b4RF7r3A4eg1xKp1GhukJGM81t7jQOYfpvhol43
345a7NTKShtxW02rNYawkmYZhl1LGFyYtrjKn6Wc2k6MGPwY+r4OIPhHYGKaUNxjb+ecg1K+B174
SuT3mGVxh31Uc5EQaiXA1nJI7ZFEDDASc9ODw80jh63FpAuVhvxpS9ydI1jLxp3yEpuNg6IWZqIU
T7foOazD7EhQa+wqB57dSMxp6SmiIYSa86CUCQ399b1OOTpUpUqSaUuJtwoV93Bqph6Sh6TEjuQ8
1Giv7bh5og3GciBndxw17jkUmd1iExkmRpFCR05x8MAyLL1BDEcwh6ffbw9fQqLS+8bK4+eKWJcf
HHgYbnBplzFEqzY7ik37GNxquOee9+4GKorFurqKC+zmKBkatgXzLFWLSGl66fNmaUs7tiC6mKDc
TSFhEtUIjR1TOCcD6OEFdpDQpoWw0LDaP1OrgUKkjXuiTWNOjaV255/CCS4ZJFZ1RZvLkyxaiZ26
CkWwHKceYi2Tq0zymxgRMMhWVhW4omWyqSzdqXZ7LUitoajwQo57sx6TsRmAJEHl4xI/wlIHYnVj
1PAOOs1qMYqrMcgWbxRIRe8ZhIZ7NpMO4VwuipNpYOYXiDWZKZZJUzYu9qLtLMFcTQmuXTqszisJ
kmUYdBDkbOEVkLDpcgyBpARx3XB4IeRKdXMNvqOAfAisHjc5zmrWvNF28eu9PJgnFGyuHFR7dEu2
38jYBTqhQKG7t4PAVFvLAgMR215m6ypcY6ZixqsuNjjUm3WAPc/X8cRdyRThQkDPcQwM