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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1152-3-7-8-9

bk: 49e95cbdEcOmd3dnvNTzWNMTNbhLIg

diff --cc ChangeLog
index 5fb51d45086da4aba2567530d4c499a0aef6bcd6,3aaab36dafbc5adbe099f3f6dee4cfa65716992d..81cbe793f18e7bfa81a4b4954abe377e4c5dad58
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 +* [Bug 1152] temporarily disable refclock_parse, refclock_true until
 +  maintainers can repair build break from pps_sample()
 +* [Bug 1153] refclock_nmea should not mix UTC with GPS time
+ * [Bug 1159] ntpq overlap diagnostic message test buggy
  (4.2.5p163) 2009/04/10 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.5p162) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.

diff --cc ntpq/ntpq.c
Simple merge