K 10 svn:author V 8 sheldonh K 8 svn:date V 27 2000-08-02T11:38:20.000000Z K 7 svn:log V 37 Resolve conflicts from vendor merge. END