# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110518072229-\ # od9z0djfndtec94p # target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800-12551047/ # testament_sha1: 47bc10c9034c7fa5ec2755c0fe13e3311162c328 # timestamp: 2011-05-18 09:22:33 +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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 QkBT/qyk