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

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

bk: 4be0dbdc_ha77979T1K48o-rAGZT3Q

diff --cc ChangeLog
index 80bc651a7ce61178316b4243c79d2a8bdc629aaa,727499475ce01786384cc0e8446e6738ebbed7a4..06b50ea7d9b4b6c8a00dff9f1c1ad5468b06e697
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,9 @@@
+ (4.2.7p29) 2010/05/04 Released by Harlan Stenn <stenn@ntp.org>
 +* [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.
+ (4.2.7p28) 2010/05/03 Released by Harlan Stenn <stenn@ntp.org>
  * 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.