# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110215104253-rk0nqzdo0m6f7bb1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: a43ea5f117b2aa3855842a18c043293f5cf45186 # timestamp: 2011-02-15 13:23:13 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110215102045-\ # 2nqfg1nuoubwculb # # Begin bundle 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