K 10 svn:author V 3 phk K 8 svn:date V 27 1997-10-01T13:27:30.000000Z K 7 svn:log V 19 Resolve conflicts. END