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

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

bk: 53119da13fggFaZor9n6J4bh73WCgA

diff --cc ChangeLog
index e9a132218b85e6b23725083881802f7435273590,add1cf2055e34024d74ee7cf7f2993e2c5f84a57..66ba2efde71f4f432a4a0e00746b3ec1df1255f0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,9 +1,10 @@@
 +* [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.

diff --cc configure.ac
Simple merge