# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110110145506-\ # 6ib4dh41t6vdz85m # target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # testament_sha1: eb6710ae959bb635b7fcd92195dde9fd646ba88f # timestamp: 2011-01-10 15:55:09 +0100 # source_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # base_revision_id: guilhem@mysql.com-20110103203618-8x6ks2ijvh378wcq # # Begin bundle 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