# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110517114210-e7dfx9z36r2tumzz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 27cf7591a015419b6cc8f144c751998756755c5a # timestamp: 2011-05-17 14:47:37 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: inaam.rana@oracle.com-20110516160139-\ # 959jwnwpc1y220mr # # Begin bundle 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