# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100519081618-h38q02qxuvcowbtk # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 22b1d3abf64c90e58ebcc95304f706b19b5999ae # timestamp: 2010-05-19 11:19:27 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100518130658-\ # rd00ql7h02ooakh1 # # Begin bundle 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 XwJdAA==