K 10 svn:author V 5 guido K 8 svn:date V 27 2005-12-30T11:32:23.000000Z K 7 svn:log V 18 Resolve conflicts END