Merge bk://www.ntp.org/home/bk/ntp-dev

into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 4308e155L0oX2VUfUYXKo_PodgWfgA

diff --cc include/ntp.h
Simple merge

diff --cc include/ntpd.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_peer.c
Simple merge