# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110131092642-5sg57vujykidd8b1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: e8a1ad2b7f4951b8f91808695a65f887e8808d30 # timestamp: 2011-01-31 11:29:10 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110130211114-\ # zh2186mt6n8q88h8 # # Begin bundle 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 Zy7cQpkfI3x/A1j1H/F3JFOFCQOomOsA