Merge from vendor branch NTPD:
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Mon, 18 Apr 2005 18:17:20 +0000 (18:17 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Mon, 18 Apr 2005 18:17:20 +0000 (18:17 +0000)
Sync with OpenBSD. The ntpd -s is included now.


Trivial merge