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

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

bk: 54c30a1eAkSmLhUpEEz7GOwNbkDNjA

diff --cc ChangeLog
index cc9788db073dbe1bcee2a1d01588dcff98b7e957,32b7b34ae7ab8218333b5ee929c63950be5829c4..609022aeac3f468bbfdce799bd64bfffbf0cb115
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,8 @@@
  ---
  
+ * [Bug 2617] Fix sntp Usage documentation section.
+ * [Sec 2672] Code cleanup: On some OSes ::1 can be spoofed...
 +* Copyright update.
  ---
  (4.2.8p1-beta5) 2015/01/07 Released by Harlan Stenn <stenn@ntp.org>