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