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

into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2776

bk: 55435af51eAUPRWXE2KFz_BJAKdAhg

diff --cc ChangeLog
index e9ac15d44a0ee81b8da06f87727f5999f23abf81,51766ae9831be2ed840336df0b7edd930a9a1369..7756b91557278f3d62c370fe13c062a80cd2641b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,8 +1,13 @@@
  ---
  
  * CID 1269537: Clean up a line of dead code in getShmTime().
+ * CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776.
 +* [Bug 2590] autogen-5.18.5.
 +* [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
 +  of 'limited'.
 +* [Bug 2650] fix includefile processing.
+ * [Bug 2776] Improve ntpq's 'help keytype'.
 +* [Bug 2782] Refactor refclock_shm.c, add memory barrier protection.
  * [Bug 2794] Clean up kernel clock status reports.
  * [Bug 2800] refclock_true.c true_debug() can't open debug log because
    of incompatible open/fdopen parameters.
@@@ -18,6 -13,8 +20,7 @@@
  * [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h.
  * [Bug 2815] net-snmp before v5.4 has circular library dependencies.
  * Improve the ntpq documentation around the controlkey keyid.
 -* autogen-5.18.5
+ * ntpq.c cleanup.
  ---
  (4.2.8p2) 2015/04/07 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.8p2-RC3) 2015/04/03 Released by Harlan Stenn <stenn@ntp.org>