K 10
svn:author
V 3
jkh
K 8
svn:date
V 27
1996-11-04T13:08:58.000000Z
K 7
svn:log
V 301
merge-o-matic.  I may have to update some packages in 2.1.6 myself
if it comes down to it, but not that many.  BTW, in case it's not
obvious, I'm mostly merging away in -stable while phk and joerg do the
2.2-current merging for now.  I'm getting 2.1.6 out of the way so that
I can concentrate on 2.2.

END