# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110302230909-ec1hurrlyvxf8j17 # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: 9f5dacbcacdee53e3b251d08947845cb54747d3a # timestamp: 2011-03-03 10:13:30 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110302090631-\ # h0blkx5shi4pqjnw # # Begin bundle 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 bScG