# 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:27:46 +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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 pVFTsRlJHybx/CzF0L/F3JFOFCQ1P2ZTAA==