# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110210015607-n8v2qcfc957r0u9u # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: 547e5406340a32bd6d844e5769951ed42799cc5f # timestamp: 2011-02-10 13:15:11 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110209092712-\ # 5vb5jnsiy4pqp303 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf9OmSQAApjfgAQwWvv//3+7 n+C////wUAXMPZxls3du22ok4S67oSSJkCTYVP0Gmk2phU9qeqbao/Sg9T1HqaeoaB6g/VBJKaT0 yZMlRvRHpED1BoAxDRtTQAPUaAYiCaCaaaI9TU2U00ekaaAABoD0gDQ4aaZGIwmmAhgE0wjBMTIa ZGhoBJIJo1GRkTyKae0iaNG0mjQHqDJoANAe8/plnwssz6dkO+Lz9vY9fSfGmjWLZfCv/mVbGLOZ KeVbaNCr76Y74jN8xkX+0rcvrsGobgkiEjm56EbI16NIZmfFSUUMFFAJ5O6f975zywWm5+ZaGbPK kwhr0Ntlv/s74Q1PCcGerO412xpOK/SnKmEOriF19v5QuUB/JCWZ3NHEbIANPCGquxSoHnCysdWN byjQOMvJuqSh/uPujuQ4AB7C5DhFAkd+4tHcnlNw8h06xftC7Rc65xTFzZdbgNG+LW9nrxn4Q1UT Z2AzpyFisSRcjpp+3YYPLa5qSRBoZXMtzMBu284oW8UDMBi4FBmQ/tFsOZEDO/x08IzkyentJVpj Ukf2JWGLc4uwLtATRofg4rCxpeW0B3CwLR5De82rSTQnyhOEXi00LldbNr9L20GoNq9ErtcQJHQK XLqw69Cgwqs1l7jKb3LDgQqAcwDPZmUi1xhrT+AwOHSKc7WRVxMM28RSSfd3Mc7sQJuNFZsaU2O6 stGwwpvI10jrnivs1XzUBRkasSI09D8GcSQ7ODjTbaOGUoE5HCaxOfcUJx5iqs790cVOxOBC0CYW vQrDjXSahUF6tU1z8s0EB+1wTrHGo0ZYm2dgpKBdoDOK9SyOyuc98GAzwoHjlQUinTIWSdQaSeCu Am+ydkRaBa4qhjYMVIlhhGlg50tgEIihF+DlcMsYiakAHwcJXYDMI2YjIAcFHtPQVK+93sUqzyHM OGJmwCopVShp6GoFPH9/ou6JuDV4XhU5rx7zuxPp9wvDE5JwE6EUzDfAdssbqPiPykI3F33K3n47 byVvns3V9263qj9ag8Yx+BiVzu0db2bzjwZuJkcPXBQGRFQU+igXLzG3394oncO6HQ+E3XyOzoef mJZaqTMZbYo1lgH+cyXyqq7MzcXsbOha+XelkltKEfpxjojcQNQfFqZOF7EZmJvsUCX9oPSBsIiy Gw6KOy8i3Q5cc5JGKcWinHUdxQW8D8BV7SIrQLK5HioF3npp6gcLp4V0kjhKK0oV8n1ti5znDhjS YcuonfnrqD3V1A/SRRSusVqkfcKPzJ9oPmutb0u045uB1gpK5PVsnvd26WJgDM+/Pz3j+O2recM2 g5nIdkU7qiKLPrpOwvm5cMKSWJduvM1LaoX0JRmxo15L2b+XFJ7o+0zlpuuTwiVXwfAr3y7t1EwN BFj0Pi+OQXBabdfJDGJuGIgQF4DJxyTOW82mBcbHHhGLnphmYZMLMKkx3LMahNglObj2piB7ZRfJ owMtSdqZ1fLxQ0mG1l2GgXwgdfFZc7Lqu9Fu6kn03ZcBHP22a6Z6GYOI9qm4oyYRRTqoW5a7JBMq 2Q4yICt6gmAoQ7A7M1i74y5QrgSwD1stDtKY2Cuyhne+QJ5RUM5sFHuEsUwF0omIEYwCDBBYI8gA R8QqEpHpvcJyLGnIKBMUgKlEmCBEREEdkzZGKIZAI5wRo1sjtGGJWG21aiD11NCxRYTeD5Jj80KV HDKub1VGzaO7S12QtVvkn62GB6nyaOvNRlh4AMsNR9wDL5UiCyvfLHVCk44RSsqnipyAua1wjDih nDqLuiKTnMgFHi2kbZUnrj7jMgUY7nwMksTusUK9aBcTRNPJlWJlRkX8c0YfY2phxZ5jaWr6xfqd uHneUyzDED5AI9DUhjIDQBuROXCxCTELSksoWaitEQhQl0q5MaWGgidAZfelVSBeVKWFRPyizyCX 6k4iSaqbW022R3mBIeKfWmMRMQCtAPRONW6MGnFBBPuXmWYVD1VV/xdyRThQkP9OmSQ=