# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110120095049-4xvjivqcldghi77b # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 917a26adadc673866ecb97cd8409086701857739 # timestamp: 2011-01-20 11:56:45 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110120080821-\ # pf3nm75i1guftugt # # Begin bundle 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 7kinChII73bqgA==