# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110315102653-7h4s9i14h8aew54a # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: d1d48d39c451b5df05ed9aee9ec24997a9b2bf97 # timestamp: 2011-03-15 12:28:40 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: kevin.lewis@oracle.com-20110309171555-\ # i2xaxkj738m18h1b # # Begin bundle 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 jWVNKphp5hqj/gzHWf+LuSKcKEh6siw/gA==