# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110518103705-\ # k3hpovzfwciqpkbs # target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800-12551047/ # testament_sha1: 51cba43eed0ce1490cc9f4f1a623ff1539e104ee # timestamp: 2011-05-18 12:37:09 +0200 # source_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # base_revision_id: guilhem.bichot@oracle.com-20110513141754-\ # 1m0zpn029ejl03ap # # Begin bundle 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 iNBrP/4u5IpwoSHRN6Po