# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110131115615-qfli2tcine0nrb7k # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 641206f267e3ea0777123455aa35583fbc0726e8 # timestamp: 2011-01-31 14:25:02 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110131092642-\ # 5sg57vujykidd8b1 # # Begin bundle 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 zuKXzhWTdv2Sdct5s9P/mtygXckU4UJBY1v6nA==