# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110117121143-3pfnb5f4ntwbnmj0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 094229a42bc6e9b151d38dac7d72c23ffe3eaec9 # timestamp: 2011-01-17 14:13:46 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110115072447-\ # gcd7bsb1njv212bc # # Begin bundle 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