Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-cachever

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1171-3-cver

bk: 49fe5ee17UC3PRRTIi68rc0KXNxRMg

diff --cc ChangeLog
index a7e4ede8ed2105235293775f15455d97df792247,4407a2b7cc4b5e629c59aae3c9a4e6e1714b490e..1c8dc71dcda18116eedc9c752281876484eb86c8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,9 @@@
  * Autokey documentation cleanup from Dave Mills.
+ * [Bug 1171] line editing libs found without headers (Solaris 11)
+ * [Bug 1173] NMEA refclock fails with Solaris PPSAPI
 +* Fix problem linking msntp on Solaris when sntp subdir is configured
 +  before parent caused by different gethostent library search order.
 +* Do not clear config.cache when it is already empty.
  (4.2.5p170) 2009/05/02 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1152] adjust PARSE to new refclock_pps logic
  * Include (4.2.4p7-RC5)

diff --cc configure.ac
Simple merge