# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100514105126-f145hl19y9cay7jx # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 09932040993e6213e47a5f364e868c26286526be # timestamp: 2010-05-14 13:52:15 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100512104603-\ # vfwkgy2fgjqtohiv # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa1nqIwAAaPfgEAQW2P//1MC EAC////wUAOZ6qokGqNUJKpkAaNBpozSeo9IAAaAAwGgAAGgAAAAACSTIip+CjZNT1RsaUyHqYjR 6QaNGMBoAABoAAAAAAkkE0CYEaZJpgSB6JoGgxLss+s5+hy2wtoysbTGbwaMiwamnt3WYl3SzMeX iecUbg2DqWXhX9P95Xk2dvNj7sKmfpjhnkRzfczY9wEstjoOg5Tnp5/vqaWh0DuigrC4Mu8Ur/Tf xWyhpaVphGojT+4lmtPFFsxNgEpbW+MCGQUL1hBmFPAHpyYTCiOxG67lWFTMeMwc6EESKgLp4Qzt DrBhTY3Yo/Q4udBWEsgyMtl/LCOwTzpcXjH8qzqEUmqCcV+Q8HsLWM0WMi6NRMGv7N5ozJwkcFbC 3hkpaGMHeNgYBWFRNkOMDCc6rX9wajcDxSVJiDyobHM3sbyJSYE7H+wdkR+ub67UH4mcLYHE1jzO Ao2C1PWRVTTkOiRK3YJkUHtVoG0PxwVxKBQpiBQbxUzGE+rB0KWcidzmuLAiSJnRVxCZgF4oPYWJ XNpD3vmMb1Ey8KVUUu5m15lrC3Ma9uwqHs+EpRyZPrxNvzeJFHk+xdoi9wY9GgjjK62VKZDU+MK2 cFZsLSszOojie+WQi2wcH1Edry6BddQLznETJlyF054A1wcTkXmzgat3y58AYnNk4uoVi95/4uBL dJ2b2ENzrENeWaiScm+Z8CcXM+/zDI1j2LMh/Xysckdw+4Mxih93hxPYmx5tUQDrw7/h1Redvj+U j1dgmRG+2jaGreW4qNAFZP4JWA4UhPENGEpCTKh05HleWSVQuFUtLu1VTZebgaluqgKw3dxXj7Cg cjG4HmNwU4+ux8cAMQG5k/pcphYiJe2CKFGGNIzwCgTwiSyIpKvvbDHvEdhFn05H5HJrVUO01GVN s1B4zRzZLQ8JEQgzu/Wn6cqweyIOT+KRHZhyTkiYDnBHkIiE67OVmve2Bt27VbEkFF8pDff3V2Wx UCWhygKjwuqZPnmmSK1i+AQpk2JrETpxxmc6MYYrOoBqLf/0NMvspCqfovj0gaepaDV4k19A8/qk E4VpiLK9x24SVdVKQLsschOre/YBXxwuWopq7pbJZC+woiCLTk+VH/F3JFOFCQrWeojA