# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110509084847-j9qvqnp9eevhdk6p # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 63712c7b7c62b9acdf40af8ff56bfeb41b7b1e79 # timestamp: 2011-05-09 11:50:54 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110509065434-\ # bflm35zc3qq4n550 # # Begin bundle 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 7mXynORpeti3v/Fo5T/F3JFOFCQJcc8QAA==