# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110131082338-2wxcbxwea01wowuv # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: dc05501bb77f40415c2a9c576989c6da47681398 # timestamp: 2011-01-31 10:25:03 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110130171731-\ # 38bb3z5znwket10t # # Begin bundle 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