Merge whimsy.udel.edu:/backroom/ntp-stable

into whimsy.udel.edu:/backroom/ntp-dev

bk: 3ef42ec3CcS8SjNlqCAn1gns2XGFlw

diff --cc ntpd/ntp_intres.c
Simple merge

diff --cc ntpd/ntp_resolver.c
Simple merge

diff --cc ntpd/ntpd.c
Simple merge