# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100506112024-0t6dm2s87xr4iyxh # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: e554d18f37bfced8e7ba3c60dcf780b4a9216e66 # timestamp: 2010-05-06 14:20:32 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100505132736-\ # 6ryopd1r7wrzrcyl # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRWgt3EAAarfgEAwW2P//3MC CAC/7//wUAO5pPZoudDrs0JJKeowjTSZowUzE0Q00DQGmmgkpNTNGiYyjTKPSGmQGmh6g0ACSIJM Ak8iY0mo2pjQmEeoPUAYAAAADQAAAAAJKKekNNDQGjEAGgA0ABbCF1+Ge1vry9DOK0DKptuTPACq tn2vL++t1WJdpZmLOfuukqLHL7otDpx1GHvYzfSHPSSaDdGlN/sw7Gpjdp+/X2RwKqWzys07wJLo tQbjpanmfLjLiz34d1UFaJ04jiuId6nSqMcXyrfSs0jgkT0m/sl7IpkJmGsbiFqRYOIzURxMXMIZ SwKFUekhSG7SohkdSqO7grhgrRaqrHCKdpnmFbtmUS0ToVvjLmUxrPQepzJQhpeyckVww+NCjEue mCJhXkTN5EwnRmHQTSdFxwRTsnRaIjKKSRQvwEo1WygmDE+oRw8rDsBaGqwKCMn0MMTlErrMlIbY LpXM6j2tEdnq62YF8PFZOiiKkQOoksTXO3U01QlTFqFMzVBUvAWs/KDUqzOvbDnTE+9bDGxVPZiu gU8VdYmSaMhQKXWFxgZDlTLfnRQjY1ReaCnnRAjXemMVHAqCdSpfazfLmbGF8GLzu1FBp2SHj5Mt feeW6FDk+EYRxXBIlC5kx+IPJD0Ncp0prHcLnr+dtBP9RDeaV8jM396R/pS+xIprJAb3pHCBbomh DCgWT0hzE127rTjSbDC9DENXNUph1uXbYDEi1m8nwDlaPL14qVdh0rj7eE7mSGypGalR2E3CahZE 5NGJuUxlX7LpV5GTih37WAoxkYNGuwlEmhmznovQYGQDkVnY6svcE836mI1yQnAmGYrMmZM+FBvw wLF2X41Qw5Uk+dDGkjPqzaaKXK63c+1Jp8H5UZupsZMzVg1OT3q2Y86xayXT5ieS1mqgHk9oY5aI +dWGDTEyTSAbYZrhYnzmhdNaRCGoF7XxJkiiJIZ4xuhqskg7kjtFxSJbOLHuOTaVYPuvOPXZOk85 wjkyXY283SmDRcfhrUGz7ZxqBmQye/ZcCwaL6QUCC9n7EwfqREEascpLZ5rmrr5U2M6cMCd91FAy yF9aDUYi3qRtSS1tcozihV1SWsoUTmCpVULwkEWIp14rwWXqKcxmyNcnjAqNwDTXa8i1iYXtDOPm Lz5SM7LtxfJ3vlaaGxtHGhdAESpENKmMTKJx38oOVuFdX9YlL7akF7dLnPW4XJxQWjG3rZm5Jlnq E2xyuFOM1/xdyRThQkBWgt3E