# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110315105747-rayxnmmy58d7d7jq # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: b1bc849356c1fe48195ab39ffd22691981bee549 # timestamp: 2011-03-15 12:59:31 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110314150304-\ # 8q7scx6sqclkma0a # # Begin bundle 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 4UJDntHQPA==