# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101201083654-fw6g5nvvj13cnu04 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 3b83c257ee5383c407b32871d5147d75fda3f055 # timestamp: 2010-12-01 10:37:29 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101201080932-\ # xj3t62isqq5lw47j # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVsQPvkAAaVflAAQWmP/91Mj FwC////wBAAIAFADbabbZt6CmLwkkgR6CZDRo0BqnkynhT0J6mmAgZIDSaU9PTKg00aaeoAAAA0A kSCjVPaYJpI08FNNB6gaADajQI1U9TaJkbQmEMmEyA0yNBkMTQJUjRonqZNPUeiDQAAAAGgKcuob z4YinL8YlTA4lQY8jp1kc7pHVPMzMv32D1hjtHMzElKX9+Oefw1T2fXwn8zo8ujbBzx9GZGGzL1o hrlcqm62VvQ/BIt6nUYG8F1J6vbceYVfM5wDlcN4ERxbdB00uD52iRLyJpHnHd+xZKzOiDtc1Mhj TrHsW1azQ0capHuYiN/ednppvvJ0msWIs7CJR1YbY7xYb14nvNIeSylsxRFwoWIYmYMmHBXNffdj U+dIlERWmhV0yYga/khjGMjMvK1cBj4J3kX6Y5rGshWFDtYC4KFWaYo3L2motGZCrFpBi6cSDhbt 68DwVS3kbFPRj0PkU8ItVPjggVVeAmUDWyhfcn/K7CrhzRxukzw17jHhBSyhgqbhNa0O26prIZwZ TCI8IcsDk85lvQWFi8WpAzoQ/YU6DQtLWAwQWcqSZhCKCdVLCslAXzINJQi2yRhaYKt+pa3oiLNb oeINMikJ6HQvBJeZ66lVdb8I7i678c51caRF6ZhmbvPB7EiNvydx1VB6KBYopiT2SxtcCr0eInQZ Mhjl8QarJ9UcNoK6i7lTEGgR+cWKGWVH1II5tjYw8uSqpN/GYsg4qvMWXfHbYhihaY33sCdCmOii Xct0VMwLmKYFg2xCqGp1wEHV6wRp0sS6npe7KyN69PpHluJXl20S78fZ02fl4YdPJnPeEttxnK7t W+poqt+lqLW3fLj2SK10PtMs2bNu369ep5KPRpL6nimTt3hUZVsJz74VFjGw4Cu4yi3akMyFsJRa 4wSNsElIRJB1Q5A8TtQkUXScIodb80j8NKP0PRtWmflHrjFsXVPsyJswj7w1WBmSM4UBQ4S1jwTH Elya5OSvc0hk0gidep1GdowKbeoaC18UyJsbY1snIJPlgo6r0QNbBQsRb/MkVvKiVRc5L+AtwaV2 wrsscm1BJ0wn0W5d226zNMA7pots4QV40SNCvJXZVKUTVfldmUitp1vVVDquclVRIvmVWMuigg3E zPqLmI6apSB98HohUTlOwqDzgOFDhkDeQMQQEyCDlHlKBHJ4JhcKmayEZ/8S/n+LuSKcKEgtiB98 gA==