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

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

bk: 551cbcf4Gsj41nUvhn3jXa7SWzQQ_w

diff --cc ChangeLog
index ae0be3052f03382d1e8e4f9c51879c09009e8820,f0a7186416a779041890fe0f6ece933641b1a9a3..517ab018791f6be2bc17e9fce046c006e18d505d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,12 +1,15 @@@
  ---
 +(4.2.8p2-RC1) 2015/03/30 Released by Harlan Stenn <stenn@ntp.org>
  
+ * [Bug 2794] Don't let reports on normal kernel status changes
+   look like errors.
+ * [Bug 2788] New flag -G (force_step_once).
+ * [Bug 2592] Account for PPS sources which can provide an accurate
+   absolute time stamp, and status information.
+   Fixed indention and removed trailing whitespace.
  * [Bug 1787] DCF77's formerly "antenna" bit is "call bit" since 2003.
 +* [Bug 1960] setsockopt IPV6_MULTICAST_IF: Invalid argument.
 +* [Bug 2346] "graceful termination" signals do not do peer cleanup.
  * [Bug 2728] See if C99-style structure initialization works.
  * [Bug 2747] Upgrade libevent to 2.1.5-beta.
  * [Bug 2749] ntp/lib/NTP/Util.pm needs update for ntpq -w, IPv6, .POOL. .

diff --cc include/ntpd.h
Simple merge