# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100819123609-5lryfm8zmb8t1fqq # target_branch: file:///home/marko/innobase/dev/mysql2a/next-mr/ # testament_sha1: e25f41c0b5e7f55d6f5ace420acd4978d8cc3535 # timestamp: 2010-08-19 15:41:40 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100819111836-\ # c2x51ninj4wors8u # # Begin bundle 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