# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125105135-g7brpb947u9wq5c2 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 74abad61282b69d4460844f1949409a7b75c0847 # timestamp: 2011-01-25 12:57:05 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110125073738-\ # 55t4wl0he4eigs1w # # Begin bundle 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