Merge from vendor branch CVS:
authorMatthew Dillon <dillon@dragonflybsd.org>
Tue, 3 Aug 2004 18:08:51 +0000 (18:08 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Tue, 3 Aug 2004 18:08:51 +0000 (18:08 +0000)
Bring cvs-1.12.9 into the CVS repository


Trivial merge