K 10
svn:author
V 5
peter
K 8
svn:date
V 27
1995-08-17T04:57:21.000000Z
K 7
svn:log
V 314
Merge in the remaining differences from 8.6.11 to 8.6.12.
Note that conf.c, although there was an import conflict, it did not
require intervention, as it was the $Id$ tag. It would have become
rev 1.8 on checkout so there's no point changing it from 1.7 to
1.1.1.3 as the "-j" option wanted to do.. Trust me.. :-)

END