K 10 svn:author V 5 guido K 8 svn:date V 27 2005-12-30T11:52:26.000000Z K 7 svn:log V 61 Resolve conflicts (and believe me...you don't want to know). END