# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101021083303-7s368m8e6potnrzi # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: fd00471d39c2a4ec543ed46ec8714195da6e1e98 # timestamp: 2010-10-21 11:35:19 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20101021075006-\ # elz43uh9qp015wle # # Begin bundle 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