# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100514131050-mkhlvlui1u52irob # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: ade435bfb12b4c27a887545d623db1fadd0afc62 # timestamp: 2010-05-14 16:10:58 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100514130815-\ # ym7j7cfu88ro6km4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQv0uqQAAdNfgEAwW/f//18m BAC////wUARhvHVSB2217m2OEkip+k1T2I0yE2TICantJPSGj1PUzKPUaaCUmkp7Ro0T1E8CJo0a AAAAA0IJTamQPSaMgBkyPU9EyBpoBpowMoo9T1P1QA9T1NADTQAAAAAEkQQTCDSbRTyZKe0Kfip4 UNlPUYEepO9Y2XPP+sS/dcWs6cvqZ9GqJPGV5tVeJ/clqjcM6WQ2X8Heeak6fkg+KedzPg0OXscy sy8antzwVfCP/daSwhfcP6Oufe/jjqxDycYcE7yBNTlwVtosK/o/La2jzSdbM8R8i/wZuxkO3Xxh mbdxz5tRSMOZxitMhD3lEZDD3l6YqqkFMbcwCkDZIkLOKQkRAljnOoRC8CcbBAva2gRgypsTCFRr Br8tYPoglCGlvaQKUYAvkMOHGZ7UezCgIkYQxTj+JA0GykyGXMMZMqJWwNzJFFYunj0vjMwm2FWn 4wURgKyZdgOg8jqXuTNGjNtZqhzMcsRW+jIhaZh1HiPHhy3YWJEnaKKGryDVeJI4eqIOYaiv1nJU K0sIbSoM5uHpmNz3XRGkkZiBfA3foVnMTClp1GBiVH9LY+4kfBJq2iS1LdEVA2CSZCHQjFukoL1Y WGbEmYVYwHLacSjEmZiKwDvkdFdebI5CBArPTeSScg4e4qTYjSk0JXkpHyla5QzjUcU2VmKVzxNu UlMpFHPJlmLbNIwlqdULPRFGDkkiUBM5s2/tIsL3Y29+e+kieDQj4sHDwO/zhQ5Nnhgakj7EbmTH 34B+Cl95ongeoxJVA1DR8CN6bTcODQy/PynoavtJB2GJkOaRFeu3akStHDkkXRvLpK4rSy1i9q0i iTp+/Wb2Wccdu0uBztMmvyPg3Ll/FjDD8zq5lpyuOBVIpHieBM6dFXu/ZzbBkhwepI3DoxrkX58T QXElFNaVCqFItLgusMh3dDWWGVpNBtBYxmLKTk7bH4bDyKs5teEowbNmH3tN5tKKt/UEhfEktRVQ XIXbbrcAiM1FmNI5GUzMAajb6DNmOK1jnWaSAxcdPfu1GnrdbFu2cdXEYYG4lIMDX9NMZRVvRMWB uU57B3RHhQ8fPKLGnlAs2kpqtR4iOFMLgaRORgyAQ1zmew/dyWe8CBpE0AeGuHcOu4K62tu25Ikk FkDerwK3h6owJyRplSGWkl1l1C5ADwXLeC2IkXDuOMkQYdCheCyqoUFafTZC8MiBvKch2enzc5FV DfJ0onpUpAwwMXShBGR/+TI3gdKBQYTJ8QWCjIcX9OJ+HwHj1oVYHOaPskQC6ZcnqiJzKMyV5Syy xUQL4a5dEcY3CHGVHTHbWiUkwlI4N+ZpdOUYyNSSAVHiXgwMcQkoIERYaSstubfEqYgM2c7NcWJF oDTUe7UhxXU0hBtlw3x0tn2JxjzjQUfgmmhdrsLSnM6fDgQPPIFik3IkYqFDDMqnJ+4uK2WB/YcB xRt7up45LFHNHzxAcVyqzZaWUEUSZNC2swVYIrXoYLoxeK3vKIf4u5IpwoSAX6XVIA==