# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100520130734-ueow9mn60czp7o4m # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 31da17b1da17a40ec1a839ba51ee5911dc9ed38e # timestamp: 2010-05-20 16:07:44 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100520104042-\ # ma2nsscqdvwoph8k # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbcRHp0AAlZfgEAQW2f//18n lgC/7//wUASM5c9rTend69UN29PCSRKemQnpM1M2qPKep6mm1PKAAAyBoElRop6nmJGp5NT1GmaT TamnqHqNA0A0AJFNEajSYj1T8plHpNDNQBoyD1Gh+pqAbUiEeoTYjKGnoTRiGg9JoDBDICSSGRT2 QnqaAU8pvQp6jJkMgAGg3chPTtYb37fY86Y1QmWNpYp4RRkYJ9VVMUstWB9cudZC8bab/HBGU7Ga dWpzc4c3DyPQsa8Lhmzv1FT75R1FkiGVGd7P0MIgkXGvboxv28/Q3n5umnSbKSn7QHYLjwWdOJFB OL/rZzRNP26VAKbCRuCYIrAUT5GKHpLBTS+5+FAhjIIlV4hikVYuq3ICZmmaWYQ0l5EmBOOiklrU yAXXvISZMYFFjSaiQF3WlYJ4GG+0FsgTTVrgcyJJk5lbRNkkAevhPTIy/uFjlxXvhaypyiS3is3V FWKiV3Cq0KFIinaaTYSF5C95rxoMyUhyKfFhm8RFQWLbaaxxWBnHyTEb7aQxlUrapQHiwOvPynlp yATkmXKSqSHIpL53G8hI8tapLzYlEpPQB5a5HjdhcwLLUb9ecxwUhXNSMSkIlKQDDgSqZWqIKHaw HtcY4wcOLEsCkmQBkth/L07CZBKsqPjERoV5UOLHoIlFzhWnECUasbb4JSGNyTynAm+456h97ZiR QOPOr51G8ErSVhUaVDdoseGkZmOoqXGAH14EcxdCD4ZoJlQEUixojlkE7rZoehvMlYxpMktINIRX son5hrz+pfD3xbIsiUcotyFLkGNj3G1syIkZHE4mYRaQndaeB+zwXE3lyuKHr1Rsk3emJ3+zCgQi tNq40rjKTEJpMEKM/tGhCtNRLnKCND0LbSp8KjPbECg+9gBt7ks5sNLkmMrMvDehzDdPVzSZWwo8 A0BpUoXQqXtOrPRqdzv1OEPH3RFSxFqNVgOn1kyRzIlYYEysKNOvADEnkYpaTSpK5LasHiuS0zJk lruGjdcT3GpbSeq9w7EokaSaYvfY4sMwlaRpPkmFqAsvfx5agu3mEU+1IrRRP+kpsXJaHCfQPNXK SEfkUJVnCsy1lpQocTl0WuNWFLc+qzn2LVDrTuAm3xc4vQ3AjPACk8ynil9CsqMTuXJEc3610PnW MBHmakFRyqOmjo2kTOPLehakYiUDKwGQthYhMiDGXbkLKyAPO8XahMbVxQsMu9j6jgYmsFpo3xKI npAfYsTvxrg9h251gDJblN6kOZMKNn34kPqzXlWSojZDEWVBoSXZVCGPCBBI0xIkV8O5CuR0k6/Y WLJQA9oDrLFbbnCmNTJMR1wgN8NChFt16cIOAxox6PAzEexxJlR1PeAZlpMJ6w0UtTZ4xWChXmBQ mN4oxhrOqIGVBs5PK00ErtNhTV4SeUH+CTZyTA9lfgOIkEVhITFTBKRQBt9lq4gbRG1PFbeVWqHX agf1LFblAynfzKRGEmmZm0GidWPrkoAz/4u5IpwoSFuIj06A