K 10 svn:author V 3 knu K 8 svn:date V 27 2003-11-12T17:18:54.000000Z K 7 svn:log V 64 Add CONFLICTS lines; ming and ja-ming conflict with each other. END