K 10 svn:author V 5 peter K 8 svn:date V 27 1995-10-23T11:11:58.000000Z K 7 svn:log V 119 Fold in conflict related changes after beta26 merge. Also, update the man pages - they were very old and out of date. END