# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101027185045-uec2xx1mxc3a602h # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 20b42be576e9810e7aafbee4028cff8fb71f2e88 # timestamp: 2010-10-27 21:55:05 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101027134329-\ # m33xa81pu6oph8ru # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRtkstIAAa1flAAwWmP//3Mm 2kC/7//wBAAIAFAD2nt2zVe7zyPB28JJQ0U9MqewTTIwqPaEnpPUepp6htIaaPKBlCZU/UzJppoS ekzRDI0AeoAGgAkkmjIAJT8mST2ijageo9RtQaDQAK/UpMh6QBo0BoAANADQyeoAkppJk9BT2qae Keo00NNNqBoNAAAGMrKbdHt39Tpt2xxMGbStBVm6MbJHw6z4VZszFx3/A8HRMYQTUOed+l2Y8vPb uOt2/rX5ecn4PzHBp1R+ryH4socLyqt0NKHmW/OoS/2wSI249CXwZ6Negj0WxRLv0Z9DlTa+LPp4 K5DYW2kZ1LKBC2qiZ4tDlHAQ8RlTq+qx4iwTTF4nOcRUB9DRBlepqMH9FNWTstZhHJhHXbt1XjSp CWHeyFMbUOMaA/YaQrc7LiXcVAOxVwovSYOXZcYCmVj7xFJJJDKRnEWlWpQTLFFgu1u1oybUCgW8 TYAx5lQqh8Fe+dRFgSGtKcrWv2Dh67H2irlcxMPVNBipzg8umcaUi1acBruBwt1UzPkKR5io51h4 GcpCPqzIu8G6Mqg1jmTG6NMYGkqZObbXB1sMBkiZYKiEmOissWdcYqvNV5LNjYQEw9XUp9Tp9Zod YWmt4e+dZW0XPmLxJOi3It/Iy6svQKIqihcBJRByaDSkQhFrU9UGS5je09XZgVu9MmPbE8ty3ftM l9SjORBFMOy24lHodFXnIxBpFNEgsWNyHPGRjBhuijuYOQwavTnlKmDfDiF2q3h0VAfrDePWkXoj TNAGQH3qpFBlmRlEBtVby18l8LbcoCQs0ps1u5cUxw9+qHm+DEiicLEU65KfxUWxEypep53iwMIH mSJyRbUJ5iK8IBuIpDiw74TK9zTWz07ztzVUnhFhnbs1ucoA9yb8PdwlNLbrwuRgl84ENE4LKm0S gxGmrNldDUiW5J0QO8DgmXHRbXuxaxGNxGEKexsWZMLGp61ayq4flPtt2FzHeZi9G6feVMVtYnrA aCNz8qocWHGaX4pnWkqrT4+qTEJe7uZHKuh0cgX4hn7Y/KiLhpiTdLgPXAM5mA01TBQFDg9ergNZ q0hirHhPCIjcm5gafM7hneO9VSVmc7k95XyE+VmDVHGAng9rGgrXZMhyGZMt3EQ+yj2UZAoo45wP OvBI7QrUrlO6OIVYsycShdrD8bIbV1/uc67qUlk9EeNpCyVBBXyWyj+vRTKRPRdJykqdvcUUrEHQ ObRlbeiCJISOoQ3cUCvaBsmmDQrzUjpwoB6eykmf82KLzIJ1wjwbCOBS2THVmcplMtIaqCsV6sE5 eIp5lhZGdov8a+f8XckU4UJAbZLLSA==