Merge from vendor branch NTPD:
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Wed, 1 Dec 2004 04:09:27 +0000 (04:09 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Wed, 1 Dec 2004 04:09:27 +0000 (04:09 +0000)
*** empty log message ***


Trivial merge