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

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

bk: 409730c70KZyWULY1RdvtMIzNkvtOQ

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_intres.c
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge

diff --cc ntpq/ntpq.c
Simple merge