K 10 svn:author V 7 asmodai K 8 svn:date V 27 2000-11-06T16:48:44.000000Z K 7 svn:log V 37 Resolve conflicts on aa_patch merge. END