# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110406063525-umeo92ottl1bmys1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: c246f969b9b83d9e7bf89cff592af5197965b3f6 # timestamp: 2011-04-06 09:42:56 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110405112538-\ # 6nrknewym022nqf6 # # Begin bundle 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