# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110616121324-hzdbmd10xygcohp2 # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: ae4e3ae7f266ac5e0abad69ebf30e0e6072325e0 # timestamp: 2011-06-16 15:43:32 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: marko.makela@oracle.com-20110616090749-\ # x7n1fq0dragnh5kl # # Begin bundle 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