K 10
svn:author
V 5
peter
K 8
svn:date
V 27
1995-10-28T19:11:01.000000Z
K 7
svn:log
V 166
Merge in/out comflicts caused by Diffutils-2.7 import...

In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand.  Not nice..

END