# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100621094008-o9fa153s3f09merw # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 1f047dcd1d81565c1de47d16738599538fab6be2 # timestamp: 2010-06-21 12:40:25 +0300 # base_revision_id: vasil.dimov@oracle.com-20100618085155-\ # xnm469cbhedqea96 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdxSctYAAnrflFAwe2///3/v 3+C////wBAAIAFAFRrb2G2Vu11VbMrtzLCSRCamMQMSZpMJ6p6nqHogNDT1Mh6amnqG1NGgJKJoG k9AEZTKaaDyTagxBoZAAaaaaaNAlNE1T0VPAh6ap6n6oekAZHlAaGQAAA0AcaMmRhGIBhNBgE0Gg ZMmjJkMIDCSQI01DSHpop5T01NpPRGj1AAGjQeoAA0OIBhQHcyc1uXJgws6irNYgjeb+86zHiyH3 kVtrbvnbSWUfoj0Q2tF59+kWE4Zd3Zz490+cj4y4MzMwYe1GaCxTQ9JOhKdMqJX9w0dn7bdh1E05 qufX+QYqPW4pfywYk2JBx0tBJRUYM3GHC9RpKrF9J7JcU6sDKMfyNztDfuPfodhzst14PHP8Xp+f XgLJC6RY7BRQFTbrP04Du7VSx7srBJahmTbeszGswM+SpGZM2NMkPwPsIYaAHypC1ihcxrecb9p+ CsVEKAwE3VwUHgZwGohimc3kFeslPUiDFxPbwPQvDVzMvOFoG2k1OhQROeKIv7maEeFjab7M4Wr9 6KnAdtcwptMmMFvymUZVMnjBaGzSYyVyjtKFPG6UCOe7HUPvfPMZNIpwLSxyNHKwYzlEVlQ+h9EC siysULG/1kszWmzOLtE1kL0sRvGBEAaN7KZCWC29NO68odnLHN8ujgaMTaWo3LeaBQnhL2qXFgWQ tMAEefiT1e4xyLBhXZJq4c4tE1w6KMsa1OYA8ijhuvLbhWZikn3pHquMLBPDVjnfTI2ELRWj5LJ0 WyinHsbFKVaaCusMBhonHx0khWiLxPTtNm+9WwhUYKpsUJEpwtYnlFeXDxQfI0CoupIFqlMxNOVG aNRHgApIAa+vbayvinxmEsyM6y2qb2uhpcFVS1jFbFeNRshp8DYcS3dMg0gxrHw1+Mr5LoqjwTIO HcvwSXWZmYb1dk/Vpet4V3HOfaj8VdDiS4R08ZWMJOjplKdsmFzoj33y9VHwUCcmJG23Tbbhwlmb hOWjv7z+Fjq2dOvk2OceaFw9mbW0DCfuIvIT6OeQNYibtzvGSDCAxPwCwhWkdPnMB8EFolzKwdLd N6FFnoSNxmpLcXr0w9EyXNZSO3wahRwF3a5BpcLNlPKM+ReQFA0jm9hjKlRx39xcAwRFuGKuuLaK EXKZuUUudTCY4uKVLe2wzZ78DqHCV8SjywEUgHDFTO1s4rV/HedSPATCQZh3ARFYz7Mpf0CsL5DI LYiiX2VqlTPZarkt7BOtURqeAYDLu0DpzJugieazKxmZjakQGQRt3OxNs2N2ETQlo7cTlXlbgy7e JuC2TY/042gsWJdpMF1M0dGrOBWZOHOqRKVvRNEJVUFsAdw5B+/vDyrsgZRcw41KC2KKY2fzk5uk cONTGlm1vNTXRYtcpRU1QoMZagoXLMLDEshLUBZRrZJoZ3wKzJ6MQnJhamFGRKGmetFz0zE05zY6 bFxFaI68U4jbdEhMWpH7zIzgpgtAWIsdvMoJkjl1PVBJgqJPLnJi+zq1Jiid3SSyxshOtJ2tIwm8 0ph2OhturR19aiLjhAt1GvO7TRo/JWYQhnJIYXDSA6OI9d6WxOjeWOMomYGXY5OUZIoBVpBsDpu1 gGA9HC46hLaKC3mplF2KoGbAIZMGBEo2SlGOgik1R4KEudoxaXRUJBsZhWw7Ct6VNO+5QlkBTphR e63c1WWVGcB2Rdau8BEw85eZg7OTY2DEFhvItgZBK2WMUS5047mrQduKXIKb4XWZq0T5JDcRTHVl STCzLx6k1wo2hI+3k79eT5xVQ+m5WsDdsVicZ0W0SoM22zIl4m0KtFSL8cbAj/iPo/4u5IpwoSG4 pOWs