# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100629125518-m3am4ia1ffjr0d0j # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: ad136959797a65f2603a82df59b1289de9da7acc # timestamp: 2010-06-29 15:55:31 +0300 # base_revision_id: jimmy.yang@oracle.com-20100629024137-\ # 690sacm5sogruzvb # # Begin bundle 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