K 10 svn:author V 5 wpaul K 8 svn:date V 27 1997-05-28T04:53:07.000000Z K 7 svn:log V 61 Fix conflicts (this one is easy: there's just the Makefile). END