K 10 svn:author V 5 dougb K 8 svn:date V 27 2003-10-06T01:55:17.000000Z K 7 svn:log V 18 Resolve conflicts END