# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110614054733-vr1y3t227lfsqzr9 # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: 037f436364a8e593ebd9a5625ea727f2a0dae86d # timestamp: 2011-06-14 08:49:06 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: mayank.prasad@oracle.com-20110613184124-\ # vgcphlqj87i157h0 # # Begin bundle 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