K 10 svn:author V 5 dougb K 8 svn:date V 27 2003-06-17T08:32:40.000000Z K 7 svn:log V 66 Resolve conflicts in 8.3.6, generally in favor of the vendor code END