# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101201084333-c5ilkrewqblfopg7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: ee05893a1a359b37d6f731eb3821685665f4b0ad # timestamp: 2010-12-01 11:09:51 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101201083654-\ # fw6g5nvvj13cnu04 # # Begin bundle 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