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

into  pogo.udel.edu:/pogo/users/kardel/ntp-dev/ntp-dev-2506

bk: 5296d6ebYNoBmI_cxWDo1DP2qX-x6A

diff --cc ChangeLog
index 831d4d32fa4378a2919030baad5e42215cc49bfc,acfdb5042e208f9d0042c47cc5db943e8dfe2d14..a0e11a1cfdb3e58626bcd79d2fb7d8f8302e459c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,4 +1,13 @@@
 +* [Bug 2326] More leapsecond file notification cleanup.
+ * [Bug 2506] make sure routing updates are always tracked
 +* [Bug 2514] secs/* #define usage cleanup.
 +(4.2.7p398) 2013/11/25 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2326] More leapsecond file notification cleanup.
 +* Improve sntp KoD data file fopen() error message.
 +(4.2.7p397) 2013/11/20 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2326] More leapsecond file notification cleanup.
 +(4.2.7p396) 2013/11/19 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2326] Improve stale leapsecond notifications.
  (4.2.7p395) 2013/11/12 Released by Harlan Stenn <stenn@ntp.org>
  * Upgrade to autogen-5.18.3pre5 and libopts-40.1.15.
  (4.2.7p394) 2013/11/05 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_io.c
Simple merge