# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110120141524-mynpxg0w0cd9oihg # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 0c5033589220fc7ce5e029ff72063ff2738ab4d4 # timestamp: 2011-01-20 16:15:32 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110120095049-\ # 4xvjivqcldghi77b # # Begin bundle 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 ChIBf8C1YA==