# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101019091242-hais946k2y58vh0h # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 77f8d1a063aa8dcc44a4cbf42be9509e6855bc8e # timestamp: 2010-10-19 12:22:48 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101019083618-\ # zsasadnzch4ou4vl # # Begin bundle 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