K 10 svn:author V 7 clement K 8 svn:date V 27 2004-01-16T17:59:46.000000Z K 7 svn:log V 156 - Fix CONFLICTS PR: 61412 Submitted by: Sergey Matveychuk (maintainer) Approved by: erwin (mentor) (implicitly) END