# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100614065030-tebecnjv316n8l7b # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 68599477bdb34718f557867d39a69963711f498f # timestamp: 2010-06-14 09:50:37 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100614063501-\ # k55k1188wsovx36r # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWrcmbAAAaXflAAQWGv/91IC FAC////wBAAIAFAD2vZuMOHE9Oe94ZEp6NQ00xMk/UNENtKaeFDJoGmEokhqbNTZMJqnoJ6jQAAD TQGRATEJsielI9TQbRqaHqAMhhklGjQbUMRppo9I9Q000NqABhJISemgp5TR6ZT0ZKfomSfqQDQb UJ3HVfeLbXDTTWOBegGr1ixbS4ugx3hGOfdJETr4j8tgg6qrqAnYVMqCC+5Pf+XFG9KPj6U5EFc3 NZ9me4KgM43tv5j49TPGo2gq4e0sbsiW0+LK+zC0WpsHDSkwLiX8iCza73Ni4CiIMgVQbBgBipxo VILTAMB6NDdavexjBwQgMIDYvaBqFcAhXuu5rEwyCsUs9Q0ruUgurR3Hx3DYzGSeIti1jUZJEbT4 MilIHmdAeOrXViWLSeEk31MG2vNJxw/CsxS5QRhJbictmbRBmBjGoO0jHo1P4sJUFaIqhnEhbFII sJpe7ypBNurBvNuYIUUfQdUcqTYRU0DRuW2btlqWCVsW+W4JZ8k14VGQmum5GCWEVOGUarskO9SR BCxAbXbpQ4CwyBnUy0dyeg0mGq0TmbqQiSWc/G8RRuecUuJOgeLMWY3gNBzBiedRMByUyzK+uIXF MQ3gJKLun5+EHryvDv26U4dtskGaaSV1UhAiDA5SkEcIgQinxHaJ1wTG6Gn20N6F0iUszN7VPbMY HU1uDHtrA9YvDwiMVnFCuIn98q6l6ZZoVVUw8LkKie0gWWHBulQv2UJLe3n3jnuC0lll5VZ3EjYT idLmRD5GdDLA1OXBxQ3E5nnTrkZ8oOGQtovUStttgh2jriyW6pRTPDLcCnQZcg2eiRvdztRPxCDa lu+qJlPB82Ji5WP2pKssQEdnKMRg8Qd8MpSZrp0jgaODNPklnyowJN2c4FDCR+kX1iHGsBuUFDWy U1Y0Bmq8TVjaNA+7r9yCxEkw1NgCuFgvbAGln71l2KgUFRxOyabibk5eE4UbB7e93dNSWopWiMx/ WYV5X4mC7lufghfwj0NwT3pLL4YhaFrmAoAAy+sgqCivMt9GvjmQWoNhBmYhcHBFTjKtbIWd6zKi YmPpjXHYbW6iY2zSNgQZ2cIF4pg00BpxPZTjl05JLWMBg8SQA9EOBA7IXoEl0U5dfgdxXfsVTdoh ZZNdzvvO+CGy3ZQgDUQLgZZjMJA9jiTE1s3R7t0L7ngHe6mJrOBCRPT+H9yIiB6lv3vGL8Dyplwl TTqedlcWZNoukGhmVJGUj5cWY8+Z6Zht7AzMLwdbDC4wtLhS4qoVL5dL9Y4R5/8CkdBYLuSKcKEg 1bkzYA==