K 10 svn:author V 6 obrien K 8 svn:date V 27 1999-10-26T08:38:21.000000Z K 7 svn:log V 65 Fix conflicts. (dist src now contains our rev 1.1->1.2 changes) END