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

into  pogo.udel.edu:/pogo/users/murray/bug-2539

bk: 52edfd91lNDXyvzArKtYoSmn7loqTA

diff --cc ChangeLog
index eebbacdafcc6fa73cedc3fefcfdb533a093881e1,52c86e93ebc6174886106fbca8c1dd8dba2424c2..e5006284d647b2824ca24cb16f3530a55cd57064
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
 +* Bug 2539: doc and code tweaks for NMEA driver
 +* Add check for enable stats to ntpd/complete.conf.in
 +* Fix typo in html/confopt.html
+ (4.2.7p416) 2014/01/31 Released by Harlan Stenn <stenn@ntp.org>
+ * Tweak the 'Modified' line on appropriate html pages.
+ * Note in the deprecation of ntpdc in its documentation.
+ * [Bug 2332] Be more careful about when we use 'libgcc_s'.
  (4.2.7p415) 2014/01/28 Released by Harlan Stenn <stenn@ntp.org>
  * Fix the man page installation for the scripts/ files.
  (4.2.7p414) 2014/01/28 Released by Harlan Stenn <stenn@ntp.org>

diff --cc html/confopt.html
Simple merge