# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110414225145-33ndpt2lfc7rkhpa # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: a492a080bd90c184516a1ac2f7e913258906c173 # timestamp: 2011-04-15 08:53:17 +1000 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110414134147-\ # zfrqphukfrro3dwp # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdxRbi0AAXlfgAAQUGP/938h mDC////wUAN13ejx7p6N6u72EkiJjUwqPSfppknqD0p+hQ/VPTJkT1DagaJpTybUyniI1B6mmnqG gBoaAAEkQmU0DTTTQgNA0AAAAG1KZTNJp6ptJ+p6ptT0nqNAA00ANDQEkqbSn6GhR6T09U02UAaN MgA0xohdOIPd0DOJmKxqgUgJ26Ue697UZPq0GZlu2gfDXbVQztPGDuvblx5GinpmjPnV+3QYf2cO wpdbVdDFOZHjLmJ4LahSmicVKn4lp6TPLHiuZDIW3QOJTi6l4bzX3mYxYiAio0MgyxsvmnUk57jP ZcbYZAmxW7vGZdoeIyF/VQ8R1jpcfKVWPe/JTaQUpNlXm5MwqCIpwVh82Wb5npo5ZGDZWZJj31F8 93UhYc1DS+qYpYKqaCREU4ReTznkiGsWXWYcf6VY9LPETA7E81dMtqzc6wi/C3DdFnCm46uQSV0E GLPVBLQypVOBRiZkMXX47FQSBKwKZEY4ivNRIPsKIRa2A2jmDLXWYvjOjLmZ2wVZwLNkY1yK5Aqp RE4XNwIwzfjEq0UEqWzYEOUbYNWUhRw15BIx5LpjQFWYhESFwrF6h4oyCXNHUpXmZyaRoyUGklad 9u486INWbG+mW3Ht9k4X9OpVBMzfZx9vti/STYYE3ZObjAwJw2Vm05An2zjiY3EDeUX97g08Ijeu KHhd54ZZH+k5pGVD6IgjqJBdNu1oaNE3quNCNybF2/Sw1nyrOByN4pvbDci49ayJ5D0heihU8fiv d9+FzMCzIUY52qt1UOaDKFZSM8dwrG9EXTuV06FJWdHYU7LLiK+O3yZ2eUPCY5n6dRrLKam99tlt Xg038csTUmXvqs8ar7omkUrA9Pvi2GmnWLvIHDVitLGzQrU76xrXcinqNYFeeaWKArFQEhbqJMOK aPWQrTzgnV1BTYg3xsdALg6OFY656jFredRFELsoUBW4MuacsCQx9iutZSxDKkNiRjT5cBbJwjEi oVShzcTg0CdikTXwlGAkAehmTKkC2lXtCwR4tMNkj2ETCi1OrL7Ta6MbXOyaJxKr+XVXdTjFlLvP QfdiC3ELYV4ZlDVrRWZCb7eBGRKFVLHE+BrclHhJSvKemF4PlK2lUoMuZpGeYE1TUPVOR3CjfwDj jQrDdeto2QAUBGsK7MK+eRQ3lKHuGETcCjKRHgLfVSiZR50K6EUwc5RXgWT02Kss2L/F3JFOFCQ3 FFuLQA==