K 10 svn:author V 6 obrien K 8 svn:date V 27 1999-09-18T11:14:59.000000Z K 7 svn:log V 56 Fix conflicts. This has a small part of rev 1.2 in it. END