# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100621103239-vjsbfe9oyj51ngew # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: b70faaeb62b15d299a1be70cab1168c092d9f8fe # timestamp: 2010-06-21 13:32:54 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100617095953-\ # 0v2pan110jlxpeor # # Begin bundle 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