# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110413083416-i98bfd2h3uwlybjz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 24607f3e003b03ef17b1e0550b7e74fafefa04b8 # timestamp: 2011-04-13 11:34:24 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110413082211-\ # e6ouhjz5rmqxcqap # # Begin bundle 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 hJA=