K 10 svn:author V 3 pav K 8 svn:date V 27 2004-05-31T16:06:26.000000Z K 7 svn:log V 97 - Adjust CONFLICTS to match reality Submitted by: Anthony Ginepro END