# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110623094019-ed27kvpj7l27i0ru # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: c3f4831407b8cfa815d50d5d22cdc94dd9fb3816 # timestamp: 2011-06-23 12:59:06 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: guilhem.bichot@oracle.com-20110607075337-\ # b05b516dgjqt1rcq # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbun4LkAAnbflAAQWnf//3/n nAC////wBAAIAFAFLXjICKINUNFYSSo2pN6hqPCah5DKG1AAaANPSB6jQOaMmJgAmIwI0wIMRgmT AIwSSAgTNVPyp5TxT1NGnlMgaB5INNqBtQDmjJiYAJiMCNMCDEYJkwCMElAQAJk01T9TaBSfk1MT U9RsRBiGho+Jpck7DWOPkmmCWiiRyhwDJamROPnuvgyRQR4C/1rGby0ZmTNd9FlCbJ5a9+ZuZ9zx 5D+9Z/NOc5l8TEptljXOtfrWady2y6Qse8cL9T2zHt9vxQFxk40qIsG77bwSY342SU8eDw3b+Hcb ez4CcwD2ShqDIPoeKq5HMcuRwxDdR9kLuOgfbwF4qsGgdm6aRLnEqmCnOfStUiW9I6pdhgW0xJnp MYGtmg2xqF4A5NN4DO0hxIFBtUA0KpWjCJGpak+0scs4zgHZrlJiKmOYi+3gHUBGiiyzcDpw9Uya FVVgxsO/DDBCq6d7SnAJ2YdTJTlcCsmIh6XMZSu2qcKsfiGCdmMh5z+2wtSNMSU5rUNCeJlpFOhm ORPoktRmnNpNQwDIbUyEbM3GIEgFmGuxwYXI9QV40s6FTSx5e4a4CZhiRNkC9VKBvar094PConkL XUMqiBAexWsqoTQxl04PIDLIa61CBMmAwqDIhaWkb7dUs5OpFGpThJLsKmKsKXwVI9SGFzQ2XYEV 0ID3FesaIuNxiDiy7UETZeH3GLYEqlxci+rKBNIpVaDzwK+8NJmc0isA5AV1vcVhIsx1BKuBfViR gbDNHCDjMRKbiqyRnBkGisMpA4CuMyki7e02JGNCGWB+x3tvnJFWkMn56a06die9Sk8GqaSrRLFk C4Z8VhyyNZAYe4cvguXU42BMtiR4r+CVV/QqHMwwzjiobu8RGeveFa/S7l1q165KpMMtYWMBNfk7 lAijsXhV6f2qjuSgmFQosS5clImryCkOHqScYni0jkceDw7CqJtiJx7DaHjNzpHUkb7Sr9PQS7il kqteirokfKYnuii7vOtYH1nEqOEx5h70vVNNTvJGRgeR7j8jaDqzzPkr11Rb3pWhPjOEwYBYXBbA /eQ7NrAYrGeTRK4Sut2qJvDYP33jh4GqNISBa1yKkr8wlLC8xbKlSGC0UCijjvGF7WtYAevpj68O ZuIs1GRhxNe85nEiR5tbaVo9pMSwuhMgGU2I/rPLLczPprjcxax6Ao1UNFmDWmCfZHFWefTkw40B yniAygCZJyHPi8NuXTM4nHQwxyCao31tL8OMvlLFZcKmkFKoFt4aBqBPgTs6/byWJGsC+Q7DWrOp w+6GRruWIsFhBQOSJErPo7zO5kWN/HPKX2I5h0RnzngbdAO9bjBI+/sQ7QFvA70cAaBQihwZDEjh xGTCTQaxU4aIlfpL1QmLiN8UjM+puTBumClKyiDDOd7wzCMXsgh28eh4J7Dm5/mDko+ZIaaT2Blu x3SZIYOLJYdFetJVo5wTv6Ep0UL8GqfxWqxlAa6tbCZoOUMDtAh67pI7C5ckfyq1Ro0MSVIOSPJU 3SgcFX7XqftiCnWTtuEYe8Bo1MRHU2icwapzJDCQKOiJREUMTMS7oupe54zMjRsovOmROagcggTd hoDIIhbk5WWc7rSltKGg9gSNSvZ6+C5SUMVNOhQpjFHMCsrcCpc9iYy6DOigiwLkDDoJD+IfP/F3 JFOFCQu6fguQ