Merge from vendor branch CVS:
authorSimon Schubert <corecode@dragonflybsd.org>
Wed, 7 Dec 2005 00:15:30 +0000 (00:15 +0000)
committerSimon Schubert <corecode@dragonflybsd.org>
Wed, 7 Dec 2005 00:15:30 +0000 (00:15 +0000)
Import a stripped down cvs-1.12.13


Trivial merge