# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100519143209-r1fhl95dy16ge4b3 # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 0132edec7308726f50b6cd2a6abfe484cb4d4a18 # timestamp: 2010-05-19 17:32:20 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100519081618-\ # h38q02qxuvcowbtk # # Begin bundle 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