# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110616123320-vhjkv8xrx6hsa1wc # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: dde31bc9961de87171e3b3a74f7c9f9e8956c57e # timestamp: 2011-06-16 15:40:14 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: marko.makela@oracle.com-20110616092609-\ # 4zizcp5lrgp4gw3p # # Begin bundle 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