# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505110314-25fyzo9se3179cx1 # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: cf2345a79e32550c20c0483135fcdc6d8105652e # timestamp: 2010-05-05 14:03:42 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100505101748-\ # 3asmflpm0cbhnaec # # Begin bundle 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