# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101202083227-l7kc6hw05sd85lzi # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 5077521477c77f3e448cb9a366324ae1a5d1e35d # timestamp: 2010-12-02 10:32:33 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101201130902-\ # q0g54ufii06or4oe # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSPnVqgAAgRflAAwWn///3/3 XzC////wBAAIAFAE3vb3ABnYNFGnQNCSZqbVPI0xJ5ATaRkeo9QNGgNNGanqaMQOMmTRiGJpgIGB NMEYJiaaaADCEIptoKDQaA0AAAAAAAAAaaTTVT1NMIYEYj0gGgYQxMIMjIGgJIiADQgDJDRojTUb Uj0PUBo0AaJpqXHYJCuN2nETfl6fecc6it8o2REv14Z6OHKajk76uO1LYoPD0zB+WvTtElE0VQBq aabG8tEgwUU2VGMFjATf19m7fqUAkMeDBsWtz8uGqJ8mqQ0M06lBywkr9++822a3gbw4JZDloR0G m0PdZwb+KkGiKYryh6snXAQehUgiBzCoIoka2u8oMrz6HPOyek9SbVnXoQttYbhb9A7wnjTEoW0R d/C9adWy8vEX8+xds/Tq1UaVbEjt146mO4R1QuvpgrBkMwzV+LtgJdicRsUBfO5tXQWV6toSp8ly PaQYZVwKYeS/pbFgkeM4jDHt4FmM6+SEYLBkEqn17Nc+S+K8z22R3ZfUsPlmKmUrDKEeEtq8zUtM xFKCApsJ9haLwIk0XFQzs9Sk4ZejeiKo02ceEMbMWaheL8icWWKKxha0xnZory8vI7aJLWxPXXIw qtYs2vUVFFqxjaoq7hw1W2rLUZ+atdR2TL0LqRgxwGHsUS0VAsnq1Zk5POqNs0xYqpSkokFxygLx uXZZgmFK65m6nRcQpoT571VVSYVK7KAq6MW1rinc1tVfIVMBPWEvGNluhhTSWElBHKQWyrLZ5q3V bW75YNPeFECh01DVgsBxZ2ias0DzMR94MeVHd18UQgoRS8WWeIt94ENdqDOxDBmagGEKdCs20kVr 26mEw26qagGvRkJdhj7JVVp0tiRGc4UKBsrCRFec8RsdiOkUJn/RFBRJUaUV0Pf4mWFTmwP7vxdM HZ0X/Pd5HuEdX+V2+/BIzJE0AqqyEfVxrbJqG/vJ7kbahFHwPKG1MXfXDrdbjVtPcuOBh+o287/j Fmi7JnN/RAyuXVefZ9qMDmLq5q51iv8+6rnef92MnYdIgqvgkbHCF4zGbTlI/3DGzvfAjNStRQpq BR1zqu/3qD5K+8oXQxupp69h4PQ90Du1wjOodFEFzgXHwkWlBzZEkDqOrAfHJiDMuO9Xr6RwOQ28 JuBlySYVjrHjkllnPqaXxc7xEzcEGvs1G5MuHCa/PN48KdtF1pWrEVqHNbmLVpjoR001T5qdbjjP geutfh22FzHJjwod2gFBcuiITqt5HENixYLKHW7wFyMAGVimMOHaDZy4mR4rKMlZdDqibvoRngtu Dcu4QazlMAuOATQhYgSfDdXYyQ1MsQ5d0sWpu0nMUwdrHsFsEf1mHFIq6+sLQg+8TIWk3dB/XckO PW5PIouN70C3UW1p/YK3mkMJmXaI0XvPwGfr2LD1LQolzam86r3qZokFCLTsQJEZk+LRKQkdkoqq CJCqpNYhkIwF6oLs0iAlModfT/1LiG3ibfL5Vb3EIpKFgvXqqhNOdF+6R6gkubq+3H5rq/t2wn4s yc/nwqgFtHwohmuOjIpTMku+mMcjiGNdZsCrnIRBgrisJ+CkmSQmGS0Ea8TqScasAP2A3CcYwuv4 WhG5e3vvI1IpMvNy+uy0jEqg37jZGihLE1sbxlexY9siHOwLgipnUr6tVqzF0XoX7dC1VX1ZY2ci vFsQmwCu6bcKAZLunVh2YK+CsoJCo/+P9f+i7kinChIEfOrVAA==