# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101104131215-pfxnpidlrzd4krg0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 65ff587963eb543ac82b562fe97987165f90a380 # timestamp: 2010-11-04 15:12:27 +0200 # base_revision_id: sunny.bains@oracle.com-20101103224136-\ # 0odvewpmt1rnvmd2 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRSbBeQAAj9flEAwcnf/938n HkC/79/wBAAIAFAEnuywi5uK7tlckuEVJoQap7U0zJop+kjEfpIeptQNBtRj0SeoEqZSaep5E3pU /VPSaeiaDQAAGgNAAEiUynoRpqep6U/Kmm0nijIGQ000A0AA5gEwEyMAIxMTCYTBDTE0wEkiDTTQ k8mKZDTU2U9NI0aDRoNBoBgHHgOHH2LzTn0YMN9cT3eHNz61GOULQXMUzvtfU5+22wyLjSNtN/T5 L7So9UiDXfE2Ta3/3+dx1LLoUg/Z4GuEf57zOVlVBfFN8Ao9xo16vWQ857GzV2rGC1DOTlWw7NfO fC4lLDyG5vRvHMOYoHBbGvYBlhXCFuWIlzQuCRtPUVmJdZYeM0zR0MwiAvmoZ4RJ6FsE2AyFlMPF Eh0g1DAx2Nc0e4XL0icvIuFCk9u+KFxmQt/cdnpxKUKOE9EwsALK35yaGkDyZfCfVMDwwlqAqGXe LgSH6DLtuwL9BcMLQDseCnMtNlWpCrKwKVHMJGbFSZiuJAYVrkauLDfaI0YriIewsKwJVJxc1e7x SzFr5hkTpaVFCKBMvatArUKLCOWyRdIxW9VV94VCXJv0ASrAzwq2p6CDRWYXChXadgEj9GJqWd62 yh0J1QsWoz1ixJjC+8VQp1Gt2iYqOfSUiiQFQTSVr7B5SXYn2kpBAxDSVsFRfvDmMY69WMPRlnrU SGrk9iSKijnrGBEcsCDppPDIU1ywsIFRSYz8OzfGrormXPZqc8ldUpwDoyarQ1St5i952rLhkGZq MpGJI/E6Os3ZR0nawQ3uBxUwhAhCElL4vB4PE4uHye9pExPi7ZL2F76DgzspQczdbTCGrR3RSTfM HXIPV1dI7jDugSm1Tl9/sLNPsplT5MC5T65zNLsoXzoCxZ2e0WTPWdZ2qQpYXnPPpSZMXZYcoVEW i9hJLWNg/OgyDSd0xPpy7S00xgLK5haLierXzTWO3k2AWSDaRB3UTI1+O4U2SwpoFtUEEMBluN1y cAZiOplqI0JR5TpKHmqWmxcliLhIuLcBndubWbRNNu65Y5PZCvjIbwZ3k8pA16bLunotI4ExOHAm MniNZbcjY68V45TvsX7N51GTH9P0OXWYgTmkC0UUudWGQsanliHmqq0avr1otAdtIZqpLETy9fRa 0Y6chRYNbNokLKsNaWpbeRLtTpGGNTlnKU5wewCR2HKEkSckthISYJaPRzAU0LQoREulI0n1OpMj PjWCvJcRnbKS3qfSEyBkJ5miSCprbsFUqoWHYBUIkcYobGDWtTXDcCircqGSSojhannEpPIS3okI wcvvXQI4GdebDA5T4gcgHeq8qc8lBILTkclMlPtsWYEN0SkFBepVzy4o2sd1tdBNs8QELAQ+eei/ GFqNqGUOdlCaLBhxEZKINwatcV3BrdJ8lpWixMcCa0ygNfA6y6S6KRRCYgmVSKh65SQiZdo1QDIi wxFUuTOMoEXX/4fo/xdyRThQkBSbBeQ=