K 10 svn:author V 3 des K 8 svn:date V 27 2002-06-23T21:42:47.000000Z K 7 svn:log V 46 Resolve conflicts and document local changes. END