Merge from vendor branch CVS:
authorSimon Schubert <corecode@dragonflybsd.org>
Mon, 13 Jun 2005 22:35:54 +0000 (22:35 +0000)
committerSimon Schubert <corecode@dragonflybsd.org>
Mon, 13 Jun 2005 22:35:54 +0000 (22:35 +0000)
update cvs to 1.12.12


Trivial merge