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

into  psp-os1.ntp.org:/home/perlinger/ntp-dev-gpsd

bk: 5312f0f60FPmLjaqULzEMoDNyuqAFA

diff --cc ChangeLog
index 66ba2efde71f4f432a4a0e00746b3ec1df1255f0,e3fb65e861452ca93cd8ef1dba4fa70ff6c8fbd7..19678212f72b3b81c7d002cea433700bc8783937
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,11 @@@
+ * [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.
 +* [Bug 2540] bootstrap script needs to 'touch' files in finer-grained groups.
 +* [Bug 2561] Allow wildcards in the target of the "interface" command.
 +* [Bug 2572] cross-compiling fails for --with-yielding_select.
 +(4.2.7p425) 2014/02/26 Released by Harlan Stenn <stenn@ntp.org>
  * Copyright file update.
  (4.2.7p424) 2014/02/24 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2541] ntpd terminates itself with SIGHUP unexpectedly.