# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100601120501-rw667o3up7hh750p # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: c0c5caff8824c473cb116985ba8e587558c8f4b6 # timestamp: 2010-06-01 15:05:09 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100601115622-\ # 9wa4r31b2lsu17ti # # Begin bundle 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