K 10 svn:author V 7 asmodai K 8 svn:date V 27 2000-10-31T14:19:55.000000Z K 7 svn:log V 19 Resolve conflicts. END