K 10 svn:author V 8 gshapiro K 8 svn:date V 27 2002-04-20T20:34:16.000000Z K 7 svn:log V 56 Resolve conflicts from import of post-8.12.3 bug fixes. END