# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20100824091714-r3k4mgxpbr2ba1iw # target_branch: file:///export/home/x/mysql-5.5-runtime-test/ # testament_sha1: 55e4d786e4ddff03111ebe176a3ba47ce7bde13d # timestamp: 2010-08-24 11:17:18 +0200 # source_branch: file:///export/home/x/mysql-5.5-bugfixing/ # base_revision_id: jon.hauglid@oracle.com-20100824091459-\ # cmh49um003irfblt # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWgFH0sAAV1fgAAQUGP/91NQ gAC////wQAMbcFa6kA4ZRENoQ9T1NpGm1NGmIDRoGmgyhQwm01PUZpppAAAGQAaagJqPSek00AAA AA0AkkJpkGoYIDSn6jUMjUeoaeptRUro6T1iVNAhGpSI8FzlruPvmfVUSevFPTHYCpR3b65k9vt9 U3pBClSN6zTVJaUoIsGnEbYxcCEiByULNrAXmd2GECqcBE0zhG7g6cIIwbcnXphDJDcrLlemZkKQ 8FUokHTUxeW/R8RH1xOPSu1Pg5bp1yhdSnp5i90596t/V8JUURffK5d4lY8ukYedagLN+cn9UywY RiWqCZxabZw3IPNrB8qTeH0eJ3edJw3ln951craX4GJXetwqEaCjzegesbIQrqsG5Mqmf167KGKH AQC0LCng47BAVGksacLhOV6mMjbS8U1zxzzlJfRwu0DeVy0uLIqdm61005hFeUYKBW6TFfWU7FkT QBr5QELIpBSiKoCMFm8xkS1BMoPatC8tDAHPPg7GvKeDm8m19fN4jvGxkx7O1uZrn2sj48oDBqLe T6aMH211giM68rwC3LK38yiJTcwELO7fM81oMkghcX95Kgsdeq43S2oT/buPKLMI+6+qReyh2L+2 RejCWSIyiApeIKtAZSjPY0XwWzOiSEghCLBTfyC3ubbFQ0Y0JihATVQGYJ41b0sjQhxZbHAiy5IU LSg4jBJDW6fUH5AydRdOVjamW5VTUKltaeP88e17H2Jo9UjXgJmTZB2ER7KxZmMcC/b1/acIdXyH 6J4Ye4XfrPe+gTWi7hn3F8Rj6TXsewzruhcLXQNF8roF4XuD5rmIY/KRtzTabB4Vn8CHptl9K7Bj Jx4FeusoxPsp83ziWshabE6gghuOZWMnsmXlbQF8w9xDL4/FSifIjmE1i5Uy4Ysy9xPIb1XwjUtV lHgm6CzE6wSfeRRPrQmpcZrKb91VVwy9FGlVyjLW0HVrtyUlING4evdXPfxKVDmdbHEhXw5zLC9W A9SzdFlw32JCtBuMkQQpx8yGgCUlwKTGDJA3GWIYLP4u5IpwoSDQCj6W