Merge bk://bk.ntp.org/ntp-dev

into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 507510d0hAJpy-gPldUWwoFnD6KvgA

diff --cc ChangeLog
index fc92a7bd9865ffa27b46aa81828accce5f6b5327,153aab41b2f8736eca59d94034724bd65a9b2214..b56988b70ff25b9d9560f9423c9675df786905e3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,8 @@@
- * [Bug 1374] Support SO_TIMESTAMPNS.
 +* [Bug 938] The argument to the -D flag takes a number, not a string.
 +* [Bug 1013] ntpdate's HTML page claims wrong default version.
 +* [Bug 1374] Support SO_TIMESTAMPNS.
+ (4.2.7p310) 2012/10/09 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1374] Support SO_TIMESTAMPNS.
  * [Bug 2266] Remove deprecated refclock_trak.c from Windows Makefile
    equivalents.
  * [Bug 2274] Bring libopts/enum.c back to (old) ANSI C compliance.