K 10 svn:author V 6 swills K 8 svn:date V 27 2011-01-07T12:14:55.000000Z K 7 svn:log V 61 - Add conflict for cronolog-devel Approved by: wxs (mentor) END