Merge pogo:/usa/hart/ntp-dev-pull-pull

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

bk: 49d0618aQjysNRyz3XaAyKgcoTLFsA

diff --cc ChangeLog
index 73be22ea7a9bb974cfc7d498d8e4467e761e7d68,99eab2e02f82878534f66ffffd810dee45840092..ef520c5c0b25b46fc8d21dcb70401da18bf0f98f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,5 +1,6 @@@
- * [Bug 1141] refclock_report missing braces cause spurious "peer event:
-   clock clk_unspec" log entries
- * [Bug 873] Windows serial refclock proper TTY line discipline emulation
- * [Bug 1117] Deferred interface binding under Windows works only 
-   correctly if FORCE_DNSRETRY is defined
- * [BUG 1124] Lock QueryPerformanceCounter() client threads to same CPU
- * [Bug 1014] Enable building with VC9 (in Visual Studio 2008, Visual
-   C++ 2008, or SDK)
- * DPRINTF macro made safer, always evaluates to a statement and will
-   not misassociate an else which follows the macro
++* Include (4.2.4p7)
+ (4.2.5p159) 2009/03/28 Released by Harlan Stenn <stenn@ntp.org>
+ * "bias" changes from Dave Mills.
  (4.2.5p158) 2009/01/30 Released by Harlan Stenn <stenn@ntp.org>
  * Fix [CID 72], a typo introduced at the latest fix to prettydate.c.
  (4.2.5p157) 2009/01/26 Released by Harlan Stenn <stenn@ntp.org>
@@@ -212,6 -204,6 +205,20 @@@
  * More cleanup and changes from Dave Mills.
  * [Bug 980] Direct help to stdout.
  
++---
++(4.2.4p7)
++
++* [Bug 1141] refclock_report missing braces cause spurious "peer event:
++  clock clk_unspec" log entries
++* [Bug 873] Windows serial refclock proper TTY line discipline emulation
++* [Bug 1117] Deferred interface binding under Windows works only 
++  correctly if FORCE_DNSRETRY is defined
++* [BUG 1124] Lock QueryPerformanceCounter() client threads to same CPU
++* [Bug 1014] Enable building with VC9 (in Visual Studio 2008, Visual
++  C++ 2008, or SDK)
++* DPRINTF macro made safer, always evaluates to a statement and will
++  not misassociate an else which follows the macro
++
  ---
  (4.2.4p6) 2009/01/08 Released by Harlan Stenn <stenn@ntp.org>