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

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

bk: 3baa4d02wOMFV3BI_4vQnIr9FjtKEg

diff --cc acconfig.h
Simple merge

diff --cc configure.in
Simple merge

diff --cc include/ntp_machine.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge

diff --cc ntpd/ntp_timer.c
Simple merge

diff --cc ntpd/ntpd.c
Simple merge

diff --cc util/ntp-genkeys.c
Simple merge