Merge from vendor branch FILE:
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 19 Jan 2008 23:36:48 +0000 (23:36 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 19 Jan 2008 23:36:48 +0000 (23:36 +0000)
Import file-4.23.


Trivial merge