K 10 svn:author V 5 assar K 8 svn:date V 27 2000-12-29T21:16:01.000000Z K 7 svn:log V 25 fix conflicts from merge END