# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110524084251-vjmufmstzrymzwfg # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: 2e11353422b5da208f889e0fc1b5039ece0fb4b1 # timestamp: 2011-05-24 11:44:07 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: luis.soares@oracle.com-20110523233447-\ # pnf6pmdtslsgfnjy # # Begin bundle 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 Q9Z6Hf8Jmn1p/4u5IpwoSBwjaIQA