# 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:33:30 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20101021080318-\ # 5baog5z7a1o0q90j # # Begin bundle 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