K 10 svn:author V 6 dinoex K 8 svn:date V 27 2003-10-14T15:47:28.000000Z K 7 svn:log V 81 - add CONFLICTS Submitted by: eikemeier@fillmore-labs.com Approved by: kris END