# 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:57 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110412132746-\ # ma35etb6imzp2tyl # # Begin bundle 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