K 10 svn:author V 6 dinoex K 8 svn:date V 27 2009-09-30T11:17:02.000000Z K 7 svn:log V 63 - add CONFLICTS Submitted by: Wesley Shields Feature safe: yes END