# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101102072805-gvnw87pfiufe4axu # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: ae6c250ec57f8ecb306a7cb7aa60ced82db512fd # timestamp: 2010-11-02 09:28:23 +0200 # base_revision_id: calvin.sun@oracle.com-20101028051028-\ # jgd5izeygjfkwmy6 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSONGYoAAbrflAAwWmf/938n XoC////wBAAIAFAELtub2xt1adarzz28JKJoTBGlP00yaGiT9NKeoD1H6U9TRiPFGmgSkCnpk0NN GpqT1HmpqA0GgDEGgaeoCUFMEKbTRGptRsUPahNMAExDTATBiQjRNqTamQME0DRiAANMIBoJKTEU 9T0ek01GMk9Ro000GTRoaGmgBoYiZFOjjJ8fx3v+HU+0UaqjqmBOrgsaa39UDdTcVPTm8wGI2/Yn 4fOhWqgiKUkg9j/YaPwBNnhFb2Xytz64t9Uhkd/KrucxZey/T8VuYuKwi92G9u2wuz149KLUg5D9 lCt5ZVw5eFfj1N/pUI7HtJB8Vd9Y5bG7KIbGNSNqUSfszO8I1ITU/PQwysr22M9VzxiqIMIcAoEl EWpAmo+qIl7uCpvI5J+YtQiooqO/POMDeZEOmQi5IpLejuPP0x2CZQdsaQivofXlEanE80cDrKmc 4er3MJmFFLoy5fSLopHO1X8EcDJeGyMTBMWHdjcXGhqCwreOxL1pmyu2yZ6GkiEGKDJddFLVFNgp JcRqsuRlG1couVQDhYaF07uWImtaDEuOzgCr2qvYlFtMX2G1LMzAsR+T072yxu6VCyGzR120qPyy glLjw8wox8sSj8uGrmiYmYWkygpTZzSZJzxtNFZCRiTIwIo5kSDCNbIbRPLhafCA3K8nrIS0UFUo 4pqpoIE5bhjo1BVfZGVMbZa1jCy+oiyLNYlAnRewycF+Ir/Dmjd7sphAqkpPL8qXGxMPo+j9t6GN 1qwxdvF6s/QMIQj6tmHE3qsJ/9zJO1+6npZm0MC9/IxppgVB9SSV1Yb6JrP5wlu+5zSLeDJi8ofD DglhxVc0C5VBHjR5xpYQtLWZ2aBM0wL1dUeAymENI4NPHi3jEtAEDO2wnJSSe0RqAkH/Im12sLe6 BzEjmkR3jrqoGmllN2SGfkqZ1CmtjfIE3JzM2Ta/OSuuHRRG7TQZ2ArAnnFLvp01V+y57ESXAJKD mqT3aUH36w581bq64cVQ7lnaBPA7UUisTSui2E12EQoFCnsRloq2bDOXZjOLWZCPzujoEzyWlp3M ZjlcREyIo1NO0GA9+ZZBV077Ig7AqhmettKTzFrJ5JcEyB476FQ4zdqlvYXLcE+6bsW1Pwy6AZeP BFfQLWDJOnqUM91RKFivJftYcAFpWBbC3EkYzl5pkhqkqv1TbZHenHEppn2JHzS6GAynbSshG7Ka o2ucNdwLESmaLMUJFUUF4HY9gnEXfQvyAQpIcEUeMG/j5kTCc75W0PMCjS7CAXEc7mQ2/skVANIz 9rzaiPlrnnVUchpEnnh1wz7QMiJgmJr4IWk8GJ4QAkll5k0xujNQnLbqGytoxRUam0CyMFqkRBda NOtVy8RGTpNtob1OwrIZa6ISQsetLb5ITFME7EH5w3KCb6TJjKoDoBgC4YiqiLUxQOOtlJI7kDX3 zRI6RD+J9f+LuSKcKEgRxozFAA==