# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110125112705-c16smqlyv2azjpau
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/
# testament_sha1: 7c5c389958d810c67ab13937b40c45495d776280
# timestamp: 2011-01-25 13:27:13 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@oracle.com-20110125105135-\
#   g7brpb947u9wq5c2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa0ct1gAAcTflBAwcmf//38j
nUC////0BAAIAFAEGq73Dyz3rp1q3YwkkgE1T2TTTVN4TRqn6noo0GnpNMIxDageoI1U2mpp6aj0
nqGamhoAAAAAAACSQECYjJppMggaGmmg9RkADRpoG1KanlTyT0aTQ0PQJkaNNDCGEaaMEAJJQU9l
J6YpptTag9TTT0jRoA0AaAbSaHvSouvzcxlucm+fr/JPZibDdY3C0RN7o7maD1wfpWEqprmZg8e8
q84IltgTxg0LaIR3LViV4LifWas8v5W/S5nHbMypT3KUnEkRpO+xc5rzLcObb0Icygi4k7e8/aY4
a+ozn9jJMh5fhfoR5rFPlApUyts3cdrts+uyQeTwJq4JlP0S0YOSXW3gCrDgVlDGBVTBE5hinNFF
T1qhSpzD9aBrHCOPXTtBiyzCIxVRRxBCyC68VL5wwcu1dhyfyvsWwVOlll6XdN2gvyTFzLF5t2iJ
RpNeb9rCMuKLxZEJaK1F0rnhq6260WHcKrJar1xWxIz3srFcs1pqeygXtHCOhDyUSnVSWwxttsVS
hFmma1dIlvFSs4WsgjFDpPdDcF1k1CT0acOlTHLaeY+mfREphHSZhMDwWoGgJTAROuIIRMCpyxIB
LcJSg3aCRBKJt0Qho88nwma/FQUh6S0FuLeSdIaRGBmyhEgkHzkOrKan+NdA7VimaiTq8GjYi15F
yabRKAnQ2xVC7inl3r5LBkhqs5t0nW4kaTQFcylnZMdWca0ikC4hhzn/b41CFoWxL6JFboI1Mn6V
tinBmqYIDNn8YTvT/sZ8MN+Cx3vmXP0JHD3zaO3rSNJabBQfIxIIQ5CvgvOeV/ayv0xfkYKE5UdE
M4Z6KnlMiyUbC5lwD+p/goB5s8ZH7r1X89QmKnol0ilUl0yucGEbynR1y3QU/IAewOSLUjS4Iyah
4r+TwTqmUKSb3QVekkO0GldPpmiVhJH3X5YDzgV/bNZKaYKDdK6ExdmcmzBzZ7MiE26gnPXfbQ1J
TsofbHi46ATTlaZb1pspxC9r9Y4I1BIrCa8UBDWPNNmLaYxmCFY1WjVhL4OWyh9xDiyollrTQVFC
cZsrglfHRfamaGEnBpDWDFIWwI+THjExgmSCaR24g+WsFkFIPcktsUht7Sc9F3JTZzTsTeogPCOJ
mn8haL0jckWh4kgztfMoaX8TdCEDMUYFbBqfIYOWDg5dgnSNTRmUIiyZcz99xAkXwRlhojrSJ2eL
C0ZV8JEgSrJArlFN6lmLyOEoJ8fLDkMhBEK1AiAu0leuwFJVmUj3pEhG6lUpKTEpAmWjAitMWMp6
HBxOLKAaa5+oV1PUrHPmqUQtqHa0xa1wnQOBReh0lfRfYcbIjZHQVm8exK2wLU8aayDvGg1EVTWj
2LW7LfNYlWjp7hUfoVhdVQZB5mUqCJMsAme4YUVur+JPL/F3JFOFCQrRy3WA