Merge pogo:/usa/hart/ntp-dev-1542-43-44

into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4bdf85175RjRq8RwIlVB2CL2o1y7ew

diff --cc ChangeLog
index 242ff8b88ee43712955c4b1717dbeb4f12d6a91e,b721debedcd59af0d6e04c112cc9e8273a63816b..80bc651a7ce61178316b4243c79d2a8bdc629aaa
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,13 +1,19 @@@
 +* [Bug 1542] ntpd mrulist response may have incorrect last.older.
 +* [Bug 1543] ntpq mrulist must refresh nonce when retrying.
 +* [Bug 1544] ntpq mrulist sscanf timestamp format mismatch on 64-bit.
 +* Windows compiling hints/winnt.html update from Sunil Tej S.
+ * Include (4.2.6p2-RC3) [Bug 1512] ntpsnmpd should connect to net-snmpd
+   via a unix-domain socket by default.
+   Provide a command-line 'socket name' option.
+ * Include (4.2.6p2-RC3) [Bug 1538] update refclock_nmea.c's call to
+   getprotobyname().
+ * Include (4.2.6p2-RC3) [Bug 1541] Fix wrong keyword for "maxclock".
  (4.2.7p27) 2010/04/27 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.7p26) 2010/04/24 Released by Harlan Stenn <stenn@ntp.org>
 -* [Bug 1465] Make sure time from TS2100 is not invalid (backport from -dev).
 -* [Bug 1528] Fix EDITLINE_LIBS link order for ntpq and ntpdc.
 +* Include (4.2.6p2-RC2) [Bug 1465] Make sure time from TS2100 is not
 +  invalid (backport from -dev).
 +* Include (4.2.6p2-RC2) [Bug 1528] Fix EDITLINE_LIBS link order for ntpq
 +  and ntpdc.
  * [Bug 1531] Require nonce with mrulist requests.
  * [Bug 1532] Remove ntpd support for ntpdc's monlist in favor of ntpq's
  mrulist.