K 10 svn:author V 4 stas K 8 svn:date V 27 2008-07-25T21:14:01.000000Z K 7 svn:log V 67 - Add a missing conflicts line for cvsps-devel. Submitted by: wxs END