# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100524114524-gih3txff2p9rz4rs # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: f2c26bbbb11b6c40ee0c6b5d77aa44c709860073 # timestamp: 2010-05-24 14:58:11 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: calvin.sun@oracle.com-20100521213009-\ # y35aa7ewi8si3siz # # Begin bundle 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