# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100601135802-hgplcpr8089ura8g # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 8c263f2caf370bab720e2b9ca48e1e8dc0753f53 # timestamp: 2010-06-01 16:58:21 +0300 # base_revision_id: marko.makela@oracle.com-20100601134335-\ # ccthwwru23kn09qw # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbjRXccAAZBflAAwWnf/918m BAC////wBAAIAFADgxom8baXXt7CUKaT0Rpqn4QMJT8hT9IBBmgyGmphKQo2JkTNJhNTT1GgAAGg AAkkJhTyCGk1PKHppGTI0ZMnqABoG1VNMnpPUDQGgAaAAaAAAJKIKeaQ1G9RhGkbRpPRDQ0AGgFJ aNPj3U2vXh+0t1Q5Eo1QAOtbHY6Bo4qO+NVU4f44uxXsjpHQHTFzfmp3t9SND6u4bIZ/dUk3MTZh Z2r7AZQXZyPgbXu468fEw6YCHI/A5MZeJbnpyqVvyv6VIgtyIaM0kcfW2i5GY1hmSO/L4NgCiIoR YgLGUXnGdwjNuMmKSE8xTPZMtMXTKj7zYyld3YR4MC7evT+zS/qiIxhc8fQm/D9bfLKaCC29hM6b P5GzOnZvHFWNV+fNr01n2qgkJHr1IhRl2Gh2vV+ptrqsIFLFs3S5geQUHB1QJF4ycslGjxMbjmtx Jjln2+axoMmpwdMc4wTEcuReeVIkTePthDfKq9OEtcOgNjoDC3VRIqFqEnYumMI3SMmceiGbh0Gw wW2ZN+qpKo9UsUuLzQxeRgl0Smtyh61iWl4kShqs7sN/NOJGFEuOI8RUpUihZOWzkrSI1+Cy16TC Qg3MlKiCyVblTWIQYOZFiWEjB8S3Gnuiz1HUxZf3zlSIcYpFRTllPcxtrre84MIoFC0h7IeZ7Q7u nvhKWhSVXCtSOGc7YUjBM0NdiRvi5Z41iVjkfcqRlYtjL2k90+TZcZ2R0wK0HuOUaOjlK9d5tx8h hNyrLTezDYwnbrakQTJD9InqOKqF6y3eqteKpejWotiSNMbBdknmsc3LKqyxQJLZ4Ylhr7Yc/5yV G7ZLVuVpUmUJ/pxHTN6+AxRQtsRFTJBesPJjaCfiXkmJmaiinQyg0SkoRpshkwGa+yCgiLCY43SG pTf0XbtMGGGXB6KDZxOu81BzTDI46xIq0mTQxYS4p0V1ZoSeAzFwZH89Mzn0hcXhd/ZYezZpsUoR D5yhuVQKsHA5qSuFa5IYOfpmkjjvlk1JGpIqDkeIzvPpXPPG6xurdAg9c6Yl+FFXQYO5znro/r+k 1JNYmLnmBcIYqfRuP9VYJyOrZEcUi8MS0tT5CqmpkgcTsaGWZ6JUNXaWIR9D6GgRjkFJgpkUCbE8 kNWt9qxLvFeBR6geFOt89eEGc1toNJd88Wii3UQ4Jm8SKnzGzFG13QFPCcFqTQtKX7TCDsRM7Irn RlYTp2K5sJ6eNDWE0qZ3WLcn/yodf4u5IpwoSFxoruOA