Merge psp-deb1.ntp.org:/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 56e691d2-4vBS3JVYyl9wrhReEVKvA

diff --cc ChangeLog
index 8e864f1bae9975f623a03a44e1137ff843a6ab57,5b14e9fafc4b7b17683502e3fea2eec697b91dc1..19f3836f81de4a822fb3c1cfef10afb774d1ccea
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -29,9 -12,8 +29,10 @@@
    - fixed memory leak in access list (auth[read]keys.c)
    - refactored handling of key access lists (auth[read]keys.c)
    - reduced number of error branches (authreadkeys.c)
+ * [Bug 3023] ntpdate cannot correct dates in the future. perlinger@ntp.org
  * Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Update html/xleave.html documentation.  Harlan Stenn.
 +* Update ntp.conf documentation.  Harlan Stenn.
  * Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
  * Fix typo in html/monopt.html.  Harlan Stenn.