# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110413082211-e6ouhjz5rmqxcqap # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 7bc0296cb186b826a2ab788413c5823a4b62c054 # timestamp: 2011-04-13 11:22:19 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110413075948-\ # kvytmc37ye1nt7d9 # # Begin bundle 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