Merge from vendor branch FILE:
authorJeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Sat, 18 Dec 2004 17:18:06 +0000 (17:18 +0000)
committerJeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Sat, 18 Dec 2004 17:18:06 +0000 (17:18 +0000)
Add file 4.12.


Trivial merge