# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110518100538-cqh1wkgckl0nl4sm # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 43623f49045e686589417d22fafaaca03191925c # timestamp: 2011-05-18 13:05:52 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110517122501-\ # 2nic8zdeknx5qkc4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbPEhToAAZVflAAwWmP/93ci QAC/7//4BAAIAFADg2yMZJmabDJJkyTaJ6qeYKPEaGiaJoe1I9Gk21QJKQ0TxKe1PUzU0R6mgGgA AAAkkBBNMU9U/EaCj1PUeSD0gZGgBzAAAAAAAAAABzAAAAAAAAAACI8Wd0y8ugps9HCKFeUwAscu LwWpTr/WXXP4oiB/6PuuRBtlSJUUmaT0fXajLbz7SR9e+txpa9SkH7kUI5OlM9tgZRsT7kKQ9dRY NmJwfDNeBlJGw+5wMhA0iiXD4uZi3SSbgKy2uiPCArbmHMKmpdkjYoeE+bwVJaJ9KhJtwMTxrSur jWtfArsWIrXDnHC8HgufY8lTF6Q6Rnya6MsPqo1Pung2XExjkLPmZfsU1EZIDP52AWCMPQ3mqqze DeSNgW0q1C0xU3mswWBZ7JkRFSZjGHi9g1oTzt2jU4Vdyx2aFp1PqsuYFjDffOy0pBqrJKTyBrWQ oY7JLWQehRYJ6pHBOxsmKwzoguxRm0369OEyGCjFOKw0UYDoNRCpSuVN8IA68o0ZnvE5Mvmu4iLT LFbVDU1uurFaxllJPTnKRLK4zJ51GDU63GWTSpRN5FyabRKAnQ2Kv7xu+3Ar6Oflx62LaCq8Z6mG ZvJve/fQjzoe33vlcwfA6QODE3hb6FtNw44gncfPkAdEzBMsCsA84RQTToJ7NAOaakHHkee/TVvH BDwxLWDiu+zt6cAEE5kP5OBtMRgZT33Xx2pkCoAvAN13YTclNqy/lleSsUU+98Fs66lQW9dR7E/4 rSQxzK6promYAllhnGD7y0i+PJ2nRnVVBzxw4usfus+3K9pbA5xhPwSHwobyDzOZQuqq3Jaq2YKR pDCpbToD9o2itmOtQ21Fw5WvGGPZGniq1DPoR4n8AYEPE2YKVgVSbinSYxTGR5f1Mb+SIGgCosJB bm6pxqcjYiOX7UjowvTJrEF+dwsQaLUrUK8VAOFAIUgGsVgJiu7SUphvSGbsC2Yh4nkM7ZerKYa3 tnW9oGsiPFXF4diDua3zXIX8jkQwE9kyzXqbRgUju00EW0IB5MEnyAd4CjzUdxF3Cq3xFqIVGJ1K 4A9Cy6FZ9BoAEOzGDKyrm4nnESoWD7bZEYplKqD0oZvrni7g1e2zahsoKtdfAUtRSi4nU5vNmja6 p+o6NO/urHA8KFTQreMzR0+eERy225OtUkUeQs1zU8rT1l3l+RcAtBHDATf4V9f+LuSKcKEhZ4kK dA==