# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110207112317-e0adanjba07bzre4 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 2a0730aeefa3fcbcb864b579fe6bb2e9d84339fc # timestamp: 2011-02-07 13:25:29 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110207092103-\ # usuct0u785h0dno2 # # Begin bundle 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 eH+LuSKcKEgv9i3VgA==