# 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:52:44 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110125092438-\ # yv6gwvmr8zv9zwqh # # Begin bundle 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