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

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

bk: 54a11d9a1Ivn2dTJ78Wbvu0A8As6mQ

diff --cc ChangeLog
index e64650d480c015406e8a002ca405cfb82aa628ad,85dd70865c7405f3a0b4bd7885053fc4c7d80d48..f399e724756f028792e9b3c8ff0e4342042f4260
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,12 @@@
  ---
 -* [Bug 2693] ntp-keygen doesn't build without OpenSSL and sntp.
+ 
+ * [Bug 2695] 4.2.8 does not build on Windows.
++---
 +(4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>
 +
 +* [Bug 2674] Install sntp in sbin on NetBSD.
 +* [Bug 2693] ntp-keygen doesn't build without OpenSSL and sntp.
 +* [Bug 2707] Avoid a C90 extension in libjsmn/jsmn.c.
  * [Bug 2709] see if we have a C99 compiler (not yet required).
  ---
  (4.2.8p1-beta1) 2014/12/23 Released by Harlan Stenn <stenn@ntp.org>