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

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/kindernay/ntp-dev-final

bk: 52af669a5X0F_Z7gZBOTMhS2_tcXFw

diff --cc ChangeLog
index 45e1ad0db6cf8a63a9d22eaa676b6d86290d4fb6,46a8d394d2dbf293a4995f05ba535209f16f71a3..e5e7b9fd18ff010d8a5df77596fd79c49ae5f96a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
 +* Incorporate Oliver Kindernay's GSoC 2013 scripts/ cleanup.
+ (4.2.7p401) 2013/11/30 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2491] VS20xx compile fixes.
+ (4.2.7p400) 2013/11/29 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2491] VS2013 project files.
  (4.2.7p399) 2013/11/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2326] More leapsecond file notification cleanup.
  * [Bug 2506] make sure routing updates are always tracked

diff --cc scripts/ntp-wait/invoke-ntp-wait.texi
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.1ntp-waitman
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.html
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.man.in
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.mdoc.in
Simple merge