Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-netbsd

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

bk: 54a67533cx5q7bFWI-FqYMFhMTHtAg

diff --cc ChangeLog
index 94fa2af0d93dcca89f43e47782ac363d6d1cb2c2,275c2563948b7b859940a1959ecc61ff413e060b..a7cda50fe99ae95c46da7da372bc5011f04f3a2a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,11 @@@
  ---
  
+ * [Bug 2681] Fix display of certificate EOValidity dates on 32-bit systems.
+ * [Bug 2695] 4.2.8 does not build on Windows.
 +* [Bug 2706] libparse/info_trimble.c build dependencies are broken.
 +* [Bug 2713] variable type/cast, parameter name, general cleanup from NetBSD.
 +* [Bug 2714] libevent may need to be built independently of any build of sntp.
 +* [Bug 2715]  mdnstries option for ntp.conf from NetBSD.
  ---
  (4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc ntpd/ntp_control.c
Simple merge