Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p10

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3393

bk: 58b69135WQ5L3_hgILpGzHucncL58Q

diff --cc ChangeLog
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/refclock_oncore.c
Simple merge