# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110330120253-qe37rso1oq3qcg1j # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 9a2a04ceba2582f6e59897375c492e1e0b9df8b0 # timestamp: 2011-03-30 15:06:34 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110330075431-\ # e56cyyr4xn62coe8 # # Begin bundle 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