# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110325131057-\ # 8lpyic3xwv1z2g4o # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-59415/ # testament_sha1: 0c5c02edce555ad24929bab468384a59c1a7153d # timestamp: 2011-03-25 14:11:00 +0100 # base_revision_id: olav.sandstaa@oracle.com-20110324131636-\ # gzrofr5dly62c3p5 # # Begin bundle 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 oSGsUIHA