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

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

bk: 547d2de8h8dNkoXTaFux_T-kvr2RbQ

diff --cc ChangeLog
index 056fb6705052ea207665ab671f015d5b86dca15e,748f6d2627a8300e697b90ac2e36a9221b8a87d8..f4a0514dd275b88ff7020b5ef5f4b7addbd2c987
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * [Bug 2641] sntp is installed in the wrong location in Solaris.
 +* [Bug 2678] nmea_control() now checks 'refclock_params()' result.
  (4.2.7p481) 2014/11/22 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2314] Only enable PPS if kernel consumer binding succeeds.
  * [Bug 2314] Kernel PPS binding EOPNOTSUPP is a failure condition.