Merge psp-os1:/home/karlsson/bugs/ntp-dev-1975

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1976

bk: 4e303033qUtRvfgKvYFw7rrenIc9yg

diff --cc ChangeLog
index e5fb538273af3c0636470d613744a055c4ec875d,d7fcdc26b07ac0cac9081234cca88c8a611ac616..0fb11ea7a3813ca95598d85a63b988fe33e7f3f1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 1975] from 4.2.6p4-RC2: libntp/mktime.c won't work with 64-bit
+   time_t
 +* [Bug 1976] genLocInfo writes to srcdir break 'make distcheck'.
  (4.2.7p196) 2011/07/27 Released by Harlan Stenn <stenn@ntp.org>
  * DEFAULT INSTALLATION DIRECTORY CHANGES ON SOME OSes: to get the old
    behavior, pass --with-locfile=legacy to 'configure'