# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100519075843-4gl3uijo6cwjtcf9 # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: c6a55d6783c33ec41259a96f6122ff71ae79db86 # timestamp: 2010-05-19 10:58:52 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100519075613-\ # p3uhza65uudm3b7u # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaTzMV4AAb7fgEAwW2f//3Mn n4q////wUAP5Pd3YbOuVbdtnBJKaTE0E9GmCaaTTCjNQ2TU9QDI9MJqAkoE1PQ00TTU8hTaQwmgB iAABkBKamU0E0yYhMo9T00JoABppkD1AAHMCYmgwmTJkyMJgmmmRiYAhgElGk1E09JoZmVBtJ6mg NAAAAACuTOySbNfoWPJu7jLj1QztMTWKnLY8DFm3bfEpqNGF9uJfYkg4/APxE7LqFBasU91Mn7NK 6Va+sw7f7xyKmc3JjzYXOTpTY6oi97p6mm1oHnpHAaB5RHHdyn/Sa9jM38oQ9CI4LuFgWKC2pu7j CtlNDq5l2pHCjOIw4JyfYu86L9kQNtnuqc2JIcIkmSILPQUPwlY2UpImK6PSppeqFojoltcsC6DG 0m1P5DpLeB1q52FiDW3USbgI/M9T58k+lmKPUUX2ts5qkVm0WJbRMmzhl1LciopgiZhQqJ0O+45V E6hlUWFZkxQULOK1NNkjVd9zsRRUxrCBQliblgMF/HYxryOrfUZ3oHZGGyTCtVJgqLYNW+5bdCTe QbqTiwpxUyUweSUgiuYUjunCjB62nVcnwH60EVF5YTJjU4uO3JXPv1q3cqQhAUJrbpOrUYF4UNWZ WMT0yKDeMxnWpGb5VLM9Ii9o0lYTzs/Wz+ZLf1nIht6MOC1GFQumCPIlVqNfxdA8QOedZiWPqyD2 WDhDhZMaPN75ririPVZ4biiUnNcXJ9W1wXJcFyUblP9pF0XRZpq0yGy7+ro/TNEQ7XoBtLjP5UFh ApEQ4TkKuUzZkjDpDw7hGjXONRCMvfGKqMR4MqNVCunkSnkoMY+TrabD27NfVDON3iJi6i2GjjGi oTLhihE7Fgmrts3Ct39ffi6tqQ29IerlQVVsm0MHj1mOTaxVSr+M15sTnL+Vcu8lxLnsYhYh1I2W ol1VneTRGS4Php1QGmwc/Ler7cpBySH7o6tMRXfdYzMNRSeBJkWgRXB+GRat/fOM22iyXMaGA+nr okJ8jy/GmLQK1huiyc7DThMgNdalSIr/thfk3izTuGma0qRYIhEjKm0ME97VaN4CsC1+ps4hUeIp kl3cBG0NaRDmlWK1RekPgkMUR5nwuq6UiGa8Yxd5eB8iTLAKSWy815pUVD8sSxENWth0VTYhS3aW aeS8DOQ5PsyOEeYo35IVwC1kN8pF0M5ZXhTjy4YJuw000WECSLMnRiM7PBjpetSYtFYktztZUKdv RhcmeynnqZjM1lCosByEQ0m7uqIFwk5uWuhFZZuAlS2+bEwhTyi7mg2/4loz3DRnWRVPlHakK256 ROxvyJiFlK8bJpU8WzxQZoFczrs8E16m+sN2kDlnaMXy02gv1MzZDarKTU/DN/xdyRThQkKTzMV4