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

into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-2570

bk: 5312ffc3Un5nT2_-b3dwFGWrMC5W3A

diff --cc ChangeLog
index 1bc233c677c0652704fd2872c5473ad9c6454613,8334f8566e0f5ced9e457f77780c009e8fc51c97..87d4489370dbe354493bf3d5cfda124e5996e818
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
 +* [Bug 2570] refuse to load leapsec file with bad/missing SHA1 hash
+ * [Bug 2562] Distribute the code in libjsmn/ .
+ (4.2.7p427) 2014/03/02 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2562] GPSD_JSON: fix solaris issues (asprintf(), isfinite())
  * [Bug 2562] first release of the GPSD client clock (type 46)
  (4.2.7p426) 2014/02/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2113] Warn about ignored extra args in ntpq.