# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511165121-9ecdbw3kaysx5cyw # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: 2c096ec828514c2cb96fbd1b9be3102aba68bef8 # timestamp: 2010-05-11 19:51:30 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100511105308-\ # grp2t3prh3tqivw0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWer1rywAAzBfgEAwWWf//38j lgC////wUAW4L2SqoEgNVawAkogp6mam0j09EYUeJG1BoAB6gB6hzTEwEaYEYRgAAACYRgJEgKaC aekDKMaj1GmgADJk0eoBzTEwEaYEYRgAAACYRgJJCNA1MAUwmjQ0QYTU9QAPU9Rpn04ttsBoNXJ4 pzbbbbG22KD7/3l/hblEczAuy6aa0O1OLLOiqzNWUkI1tFS7lokWlN1ESda0wpfx21L4Fxg2Am+/ sSRm6OGB5c2YN+Ga+mUnRmRkTpIuylZSIrksTMK3pMleGy2EKmSDgtBKsFHK/Hac5wqOJR6K7+2X Z3zx2TJ8Z20itpWmb2GDB/+aL32SaGVUTMjpG6qILCituTaA1s7yS2Hz4/XKcrjiG90yFvKOQDsq E/bAHGJMMrn9NlIyRyBcSXTpXTsqe9HMZsxYRoaS3MUsYbXRbnvN0dKgmA2kMLwSmGJ4EkiqvQai QDg6AupWOJWc7EgJ2J5pDOfVIDzgSmJRikPpCddr+byAyebEhnAUWjmgIqKHaVzY/UUgqF7FgGSe RJhjSDEwHAcADUWMdtJlCWC1FDUQb0V0uqyrCamnY2zKH2BFY4QwxS5eh7nkkZgWEp2IuKJFAIDg nGRlhnKZ4oVhQVRhrLkGUxW43nYUiCkTY5Ni6VSZWTmwoDQpnHjyT2eOGCLixBUmRIfCFznA6ltO FTvaHeWvRhXTOC2dqJA4xGpZoQGNxBVGJWUEN3FQOZUfFiRFgGsGNbG5DzQvf+UitIiBEhVgu4nT 6x5AwO0vMjiXF8DgegDHQaf8TTqigcYW3OaTjm5yCMxlINocCBqcY0JtbJbJn1JxA2v1micDwPxh oMijg5WkjE0cZAxuLjIvIGUMns4bLFVDJVsS0qKyfYNtGMyN1bjEpJym19hstdQzhxS9h2MC2rRT s05I6QMimzLjoMhCgJ6FkRU2t7POTaXzZybqmeTfXEafKNKDj+y27ZTgq4lkOgF3GejabceGvuJH 6KbzV7EWP8JfHuTET4HYCL7k3ik5D8fTOcH+BAXYdRvPMF94HV1ApVDkeJ2kT9UL2pL1dUU28pAb 6gXrpaz1elzGP4A8czwsMz6H1MDl62nSYsQvrAic0kunak3iTHUQvLigD78Zm8+g/bSDAm9BK7QC q9i89TA6D1LQiDUFYEvYDE9i7tOZvUetQOY4SuO8vMDgOL4Havc14lbVqCPDvLyJIDORbQXaneJV vK0wtDHC/5aBtLMyYameocg7hpkVE+M5uQ+OcWEI40qRYFZYtFTVWX4pccFqBjh5fFxMWXG03J3A TS+ZYQHkjABbIlHJqM7wJzgs9UsCBMXI3mZib91QQyoiSYE6DMlNHgsYR6E5CdXgfm+C42IdtQuu S+xIHgopcC/eSBMh53mVni6Y+Y9rdIZIiMS2gskvVrPYaDByiTa85UqSOHdVPniRV1kRY9xAlpXI l8aVRRkM3PP19WVE2JqJdSFsa6sZYlSkogC99EoK1GVWlry4NJlREs5ROqquAYzKoMiW7uVNI2ly tXiZ5G/qxVqAzkcjnEB1vhqXsntiq6KEKtX2QnDkp5yIzDJy20EGGbLI2wZVLU4IHEQcllezNSqA qGpQzPAusrsJ6NVbNOTm47wdoOucVhFYWjylKehFK1Tf2MRYMSJ2FzDSnPpvrZJuo6KCtVGZh5OS LxrVmagdy4AcvlvNu463VZASSwNiGKNYOd5HSQfMbCREoL6rVkBzAwJn5mRemhTt/8XckU4UJDq9 a8sA