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

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

bk: 52c017a3k8ZsSdhHEx51AVBtE_84gw

diff --cc ChangeLog
index 6bd38f7476168bc7fd948d38619c70e71b5cba7f,2406c3c69751872cdfa930a30fcca82a4e29bc6b..abc4aaf71066bc4b5eaed908b62c7287f284d926
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 2187] Update version number generation scripts.
+ (4.2.7p407) 2013/12/29 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2519] mktime.c does not compile on 64-bit Solaris but we do not
    need timegm() and the Solaris provides mktime().
  * [Bug 2522] Revert Bug 2513 fix - it breaks backward compatibility.

diff --cc packageinfo.sh
Simple merge