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

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

bk: 4760f37c00u6mFb3rv2D6U-Wr2Qd9A

diff --cc ChangeLog
index 04ba671fcb51e43d05139b90bde311e76902ddfc,e70d6656a02a0eec487498316136af151ac3d1f4..e284130de2f8b766914f2416a4341de83a6377bd
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 830] Fix the checking order of the interface options
+ * Clean up the logfile/syslog setup.
  * [Bug 970] Lose obsolete -g flag to ntp-keygen.
  * The -e flag to ntp-keygen can write GQ keys now, too.
  * ntp_proto.c: sys_survivors and hpoll cleanup from Dave Mills.