K 10 svn:author V 6 trevor K 8 svn:date V 27 2003-10-29T11:29:07.000000Z K 7 svn:log V 20 Add CONFLICTS line. END