# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110127081524-ph910ewwem1u1ar7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 5a2067683e4ef59524f823201e1564ba1d10819f # timestamp: 2011-01-27 10:15:33 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110126081028-\ # v3rublf9e9dtedm0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ2ZMd0AAbZflBAwcnf//38j 3WC////0BAAIAFAD9GUxLPbGdTrhJQhNPU0aDTI0CMm1GSbCTRo9QyNPUxqeoGSJkyYIE1HkJA0y DBMIPUPUANAEkRNNVPwQniKfqah5QPUeo0yA0DQBmkaDjJk00wmRkDAjE0YIwg0aYABBJJU9MJqZ tU9T1Mh7U9U0NAAA0AAABazS2N2y7RW/szDXPGvBMt8yBW1i160Uq03/yt+qeiIhk+yycYYy7C4l ZFCN54I779MGdmbjy9YHecZ5Mh+7vL0/sLiBmC217mMCvvIck9JJPS7YDWBAh0Xts8+6rXFaPCmf 0XqkftdqmLSnJ9fHwFliXvZxQvwrMC9usFp2dGG7LG5LWzTuBeBRBYsuSoy0qHEpKgVJTeDLLHXr HaM2FzrtrQK1m3UJHnzqXGb+XMK5IvLqJRUEMhqhxVYvfdqgVC+p72KC6lJwVgmuHfsoKxZYptAq KRRX8eJInvuHl+YToDVNNQoZZ3Rxb2+KP4RrNbNqastjktJItkalT3VUbTbarUo6GJll0CeFhLEx kOaVWZqDY0iIgFE1P4gJbXGoZ2EYBRxgtSV2yNdWgmhU+NeRgJTYWvIxEUKADZiLi+41zEIHFoYL FwXcajiWkCl51WOhfSAlYLaX0ceHlBWcDqUxJiYlI5nmbjaA6io3NRKpGaJJ002kSCmbaFVzmPmz Ylj7obNvfuWQLhX+jqK7mTHNR1/CCOuXCbMdLj2onEg7nAnvrOrpJcJDBMWhIWVQHeKpo2DYhyrl qrEN0rMLxrTRAPd6Khu9YlphDoWanVYOnWC517MJXq8d4K4SxdrXQBUC74Ns8jSJdlkUiKngub20 MeyIqm36i0rPcX7+1bpSneR+Kyx8NfzZDF+1lEbKdFJUmyql6yKytNnTXtV3cgcw4E8DgxYgWpf5 J4CLeN5rKLLI4GF1qsjtFC/UX02IhBp+sQ2eu6iuquiGA6Wvax4QEZnt3btZuTseqKst5TWKYrkL IP40eC3M6xajgmLVLcwt0ZmZsZGi2KJOjVNGBdVZXcYWDAcurRiYq+Vjc7kWZhMmC9W2jwcS3yTS YEyGcvJw82IBTN5WVSTTj0MZDEiEluIwGemSH6IL30AwIU+ELoOcgIUAmg0jlQVtD8UUxxvw0exe rSIpxP5AXHSH1Khn7mKzwvMqoxNJQRiMlVCF7hFo5gOrluEpUi4yYMeNCsSJ7+pG1CzaEosSl3zB TB14XVWbCrBmXYQI4CnhK+RJ8M7pxQANlpBFk9jlO2hCmqYWUEeVUIdSwNBFjKmx2NFdKGpXe6Q6 xGOIXDBUUTuDZBVVhyjcNaMhnIaKQTiBMuCNW7snFX18worPDLQRV9saP2alWtKGz8goClUOmWI6 UYQP5c/8VuH/F3JFOFCQDZkx3Q==