K 10 svn:author V 7 asmodai K 8 svn:date V 27 2001-07-30T16:55:52.000000Z K 7 svn:log V 19 Resolve conflicts. END