K 10 svn:author V 4 kris K 8 svn:date V 27 2001-02-26T07:17:03.000000Z K 7 svn:log V 18 Resolve conflicts END