Merge from vendor branch CVS:
authorJeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Thu, 21 Apr 2005 06:33:15 +0000 (06:33 +0000)
committerJeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Thu, 21 Apr 2005 06:33:15 +0000 (06:33 +0000)
Add CVS 1.12.12.


Trivial merge