# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110622084010-fdpilo8m8mys0wtz # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: 1117e1c39841975a654be6bf64f61f8af6d496d6 # timestamp: 2011-06-22 11:44:43 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: marko.makela@oracle.com-20110622083241-\ # qanvfneai10tjvkf # # Begin bundle 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