# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110124082539-jxezr26rvg36hev7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 12a79f8beef4cc58375e868ae9de198207f29703 # timestamp: 2011-01-24 11:17:10 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110124080124-\ # qt318pe7c3iltp3p # # Begin bundle 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