# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100630095510-g6fw2z0s1mo8gav5 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: b3d97a895b64c46fdd68d1d0285cff21d2bd1ad2 # timestamp: 2010-06-30 12:55:17 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100630095241-\ # bietgukdy2g6k7x4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWehfBrsAAePflCAwWnv//1sG XKC/7//wBAAIAFAD7QI0Y14OW4JJIBqT0yE8mSn5RjSGp7UBGgDNAgSVU/Uep6Ypsk1PTRpDQAAx AAAAMSBIwR6J6jUnptIRoA0GI0ZNBoOYTAJgBMJhNMAAAmTTQMJJSPUZR+lPak3qNMkzUNPU0AA0 AGhoYBxTlpzXao3fmvta19w8t5eR+RHFggvmgluiguHw390X0qz1ZYVpI93afy+q9r4ddH60lF0p P8h2ZxHmHR2uVl+O143694uJJ6THnZ5RuVjGS09qtx3IZlVozqMgl6nGvtH+azAufBccJOlbQnTx fIrhOWy7RN5xEzNOuYS06xLX2SWUzyvdCuhgpAZnWOBOBaN6FzKHwhRpehW9UcTxiIFDCyZTOggk XwKxTqRlIHAwm0CvcC6OG643wfacnhilUu2KDJVqsqpt4Kgd65Zfunm55W2NNEBOyY0lcfWKS291 4KzfMNQTg4zGWl46RTuRXi3iiCOjAOHMDCuAt4z4OAMY6ZtPHjWGPKg2RzjJhulJ5126hZotFSSF xomiAkwgM8rY6Yl46BiW8gPiaLPCNb7QY0xAnauwOB5wMniRnDQRQZmzGFGq0BJmAOx1HsLlKSKk TIHQIdWNW3ZfUU4fiixM2aqrX8QMtGyYWrDzuLqhVpcKkMMYWoRTRusmoe4G5tJhsalrKJQI5LrL Bhv5LtnTwXpxune02Nwm2T1HYRRwgxUlAVASqVDd1DIXYXiz2s7l6eoXHcCYCtJLusLvHxkRCHOE fb1dC0fHO/MwduMJI4LipW3bRLww2bRKeccDrRLvppIig1TC9CUSz73LEW/ZCtBUDcOkiicnZ+jE MNnj1wIYmT6MTnWN603VyrHOvjs+desmewwlmEuXRPpQ7dY6hTJYFlvtCSyqNONRoM48e/pCWe7g ALIZht41O3SVUNuc+MMN17HvHr5n4c8NFLbI7KlqyZWr/jiwAzLvTLgqyGl+gsszAwTCvq5MGcYh GJTXSsRdIumJzXxYKmWhmvCtus1otwICjaKTTjCgjbJUFBRAMMo+1oEDqTOnCopVxPLAfAlWvJB0 uBG+jMSTRwJqwbJWDCXwYgxgFOrZWlOE8ggzvEmOTKTx54TExcSXKJbxkDwNQ0mUivKWd08FWOMA rxeH3hwLPDgEHMeD9Zcd+8zBcijx4gAWgw1Ip62gnchIH1vA+4J5gJH+S9jzOR3o261PZtZi4S0R fqeKYxZXBBanjhX3jxr5wuAJVshhdRtmxFkptJpUyf1igzEUMKouY5NSGlW3P/XhIirJbfwaBukp G5DIXRB1eOm7WpiGELyaxVmLuOQM2BWv0SFBTFNKgTrA0NUFCkNxoozHfwWGo/xdyRThQkOhfBrs