# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101020125847-g0flbamnsu8jzoc1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 3a213df025087bddd9114a3e30ed5daee023c86b # timestamp: 2010-10-20 15:58:55 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101020114628-\ # ly1tyc8etgxr985x # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXoiwWoAAZZflAAQWmP/93cn BEC////wBAAIAFADmV7mk3HRNxgkkmpqeGpPUbTRqenqNQeo9TQIzRGA0CShTZNMjQRPKaelNqAe oPRqaGQACSTUxJiYJo1D0KbSekA0000AZAcwCYATAACYAAmAAJJI1RmmFMR5Go2kxGGoPUaA9EYU 4Z6m8e6427YLdNqkGxNHKEO6RTTC73bmZjx71+KJsWdTPB/7Zp8j87fN/nLwc/n2aOz9sosaToPC 6glDDf7AgwcuEpwqQJ8COu6Jus/y9hH/XGpl0imn7Hqy6zh0Sz5M6RmZbxGWptcouLlGHbawhxDL mmFDeMI9NzElTJ8AzmhBllKOzBOwouitYxSKUmExM3fcEeTCLNXH7mLqk1zUD2YdStREvX4r3dEz nivb+bTGwmxYZaqWuMdBDEHXrTi3WNonPOadrBZODH4s6IvLptK530fHSuJtVsFRbAoinY4YQwbf sgqxX2OWFOSootOnhjaGBlRuOoVXdISURNtoG9owcsHtfLFN23QVVPPYn33qeSZEUqUVuFNklszT pzUib4TjsrU1DcqiqIwugKpUwcxUpWYjxXkKPZq1vFThZjiTTlRZlPPPpV5lnZY95sYqyhuvaUgu cjBNNolINOlsF8Do9uvIavterLXKrKRHyFq3BGTMMQB+dSIIdyiRk6fcszLeDZKKV8e6Rbl0sFfm 8mbYMuoeGpPIc9Zz4CN/likVT1SB33iP6+t4s0vLClEaBG80OMAbSxqcs+bHtgLHaqKC6GAQXoLk iRVrjyTk8m71BZf5HZqbQ5IkViRjZ5PO428Xd5cTknq8bSBUpfs6Z+CgZL57dF5vSTj6qn7OXrsT kh6aj384WyS3S2mTbC+5trsuUKsN17qY83b0cWdsNNsvFY0flx7JGcib0ycUXW2Rvia1OEqkmVTN WtZMfeOOZpRaHFxhIuoTrUVKLMXlgSTQUJCspp3JtmRiuocX8l2BVPtkaEsuz3aZR2hwDvspdVZw FpRMuEfzMNEjrCIRaJQsFwakMNww1li3ujBOzV8vekVCKFaaRnU4VOdpfH4DSUxvSeOHyDgqfCA7 BfWYJ01nB6xNUhmTKjo4pHMT6twlIKHPJI5BSuyCuswxZlA7w0i5PGWm3YGLcVqSWcRT42k+uKRN MXvrjGhMo1v10ytrOpq8walc5kQqExXAYy8aE2wmZVqToXZyLAkDU5qhyVfsUBXTXgzt35TUClqv DW1U5JjzmnrfYRZctyUKz+irq/wz6/8XckU4UJB6IsFq