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

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

bk: 54c31a56MAkbUQ_lAHAVgwsQk-QACA

diff --cc ChangeLog
index 609022aeac3f468bbfdce799bd64bfffbf0cb115,379ceab8b6b3e8c63a9cb157c48d3fb9475e7edf..80b4ff162a87cc7e24cb320b1e677394510bfbe3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,10 +1,11 @@@
  ---
  
+ * Start the RC for 4.2.8p1.
+ * [Bug 2187] Update version number generation scripts.
  * [Bug 2617] Fix sntp Usage documentation section.
  * [Sec 2672] Code cleanup: On some OSes ::1 can be spoofed...
 +* Copyright update.
+ * Fix the package name.
  ---
  (4.2.8p1-beta5) 2015/01/07 Released by Harlan Stenn <stenn@ntp.org>