K 10 svn:author V 3 des K 8 svn:date V 27 2004-10-28T16:11:31.000000Z K 7 svn:log V 18 Resolve conflicts END