# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110606132831-lvvmxzkq1edxt3st # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: fb4b254d4e983bd81526f36b63d479643a819c8f # timestamp: 2011-06-06 16:30:49 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: olav.sandstaa@oracle.com-20110606124955-\ # vts4ql8y5c8n3tqu # # Begin bundle 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 kU4UJBzQIbcA