Merge pogo.udel.edu:/pogo/users/kardel/ntp-dev

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

bk: 430c6e57XytuMteD1fFVxC2YNAv87Q

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