# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110322113916-oricw02qg3tzvim8 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: e93268f1264c8441adff753583178553d7a692f2 # timestamp: 2011-03-22 13:39:26 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110321075638-\ # u4i8z7g8he5g4qcg # # Begin bundle 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 dyRThQkFgXgGEA==