# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110421092445-13329p4tqicfj583 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 0dde4a2c2b007eb8f8fb7225272ad9e5cad07c38 # timestamp: 2011-04-21 12:24:58 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110421081100-\ # q808ffg6wq7q3d12 # # Begin bundle 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 AvZwBs7b94CMkTCk5jv4VuT/F3JFOFCQLfpL6Q==