# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110125223359-bc6tfhyoox0rm931 # target_branch: file:///Users/sunny/innodb/bzr/5.5/ # testament_sha1: a69c620342166ed0d8cf0d5886766318fe9f19ad # timestamp: 2011-01-26 09:54:21 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110125103535-\ # yrom0ik8nvn80edz # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdjOY8gAAbHfgCQwWnf//1+n n6C//9/4UAPh4AkSAAaIJqbQ0Jqn6aaniTyKNG0IMNA0ank8p6o2hxkyZMRiYATJgmQA0YRgCGA4 yZMmIxMAJkwTIAaMIwBDAcZMmTEYmAEyYJkANGEYAhgEkkxGgJgQ0Rqmynqbap6amjynlPKGgAHq KChIcsc9nGtG/Y+KGIKZsAIQIrYqzJyJ8AmQFMPKLhmkhMzLh6lgphiM5JXkrSheH/+MTuhRrzvM yxv7uveHqRWb+EX3Ys4YWqyQIvFLLY0k3KgRVLc22XosKmqqkggy5c5PBqfTl19NZrsovLEEMC1E A0qm6Oav9lpxOlql/QyKckAhcXN1VabKJ+iqAuhp27L2eIsUEhzL5jw0TOvIPcVKK1xninPiO8Fq tBVq6QxYycvopEeNS3lvdaIdM5ZsIl50TYkMlA50Wo81oRt78SYj3b8R7Lr1zyvltt4FV3AR13vs gLfdtEwiqxxWTJ2DBr2N5I4YlMs1jcyHtWOFcqFQLZNboqdOdSkT4OtwUhpDccISeUEjasP75YLl lJXDk4YT02XTvZYYqERXed963KfhRg0rKHM/pNrmcppKFtyyvU4tLenF0l0lygqqlhUbJicmkxBb ln1qeqJaxBsiiM1cNd+dhwV7jJVCxuTuoVyk26MJ20LicvL5YSsosjQ8me0aVumIOTTtAkDE9DSX fs8AetwzQ0JTRqzRl0C0jBPCEwY8hFahG5OI2hn92KhIXhG7e0fVyw52L4R+uF5sf4YNN/nDSyA1 XzbS9x06c9xgdlm2BWd3g9d9I73rmVHxXt8JvX0SHUWXPDceSXcvTPKNHwrROqmINTgvHQsO9Lae YvtUG+e5EeaGMBVJloUHBVoMYPLF4L/RoQ2jmZI7axF2sWZlVdrTTFPXkfWkwopyzQTx7CusElrf UJLjchdwUd06gCl06PZ0Sss1LlatCTlRFABSKMrLgzk0uKemat5cprMWKrY2g4cEDzJ0kY4pk1d2 hDjy46kgiA6hZHvM8MYb8CC3Ks0rF9m/WhjVl0sN2KahGfFMDRpU/t1WirCBXtO+zs96btn0M1jW nmz3BNa/jmgj/G3OfaFMT3B2DqayL+3Zrmm4LYtAo3LehwUuSiTpDFk9GzONFViFWJuaxUyk6srv ntjE/6K0oj4UGaYj+4im9qEYRccYKZkEwilDDJl1LBBu9dVkZbRDl4ukHPCGAnOpq9BHIJlzcuOL 83JV3VcGZOHyzfo827Q9phL4zFkET2VkOUF1ikrzNQunhBMssDqcA/qjG2tsGqpBrZKqUBoo/M/Q Zx+SvTD5V29TbJm8yaZ1tm5FBr5Ccp8ujYcqwsRMnuVWR58VxpnXqUgckUqG8HK5OrGTxcXBCrCp zTANSI8RdCxvK2amz/xdyRThQkNjOY8g