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