# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100602102637-2tdov7jgx613vrrs # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: daafca6ed0b16e9fcd18b9fa8c4bc02ae797d39a # timestamp: 2010-06-02 13:26:51 +0300 # base_revision_id: marko.makela@oracle.com-20100602101940-\ # 60x32xiivtqj9va1 # # Begin bundle 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 AA==