Merge from vendor branch CVS:
authorSimon Schubert <corecode@dragonflybsd.org>
Wed, 13 Sep 2006 16:13:30 +0000 (16:13 +0000)
committerSimon Schubert <corecode@dragonflybsd.org>
Wed, 13 Sep 2006 16:13:30 +0000 (16:13 +0000)
Import useful files


Trivial merge