Merge from vendor branch NTPD:
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Tue, 14 Dec 2004 16:05:57 +0000 (16:05 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Tue, 14 Dec 2004 16:05:57 +0000 (16:05 +0000)
Sync with OpenBSD.


Trivial merge