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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2037

bk: 4eebff85HC96MV9S3z9hWtO1ooWiBA

diff --cc ChangeLog
index 779b124d464dd783e1a3818e7b8476a9890316fd,0be3075dcda4d871d22008cf112780cd04840d97..037ff3965345bea3a9626786ea7957b9dd9f0d9d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,4 +1,20 @@@
+ * [Bug 2037] Fuzzed non-interpolated clock may decrease.
 +(4.2.7p240) 2011/12/15 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2092] clock_select() selection jitter miscalculated.
 +* [Bug 2093] Reintroduce smaller stratum factor to system peer metric.
 +(4.2.7p239) 2011/12/11 Released by Harlan Stenn <stenn@ntp.org>
 +* Documentation updates from Dave Mills.
 +(4.2.7p238) 2011/12/09 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2082] from 4.2.6p5-RC3: 3-char refid sent by ntpd 4.2.6p5-RC2
 +  ends with extra dot.
 +* [Bug 2085] from 4.2.6p5-RC3: clock_update() sys_rootdisp calculation
 +  omits root delay.
 +* [Bug 2086] from 4.2.6p5-RC3: get_systime() should not offset by
 +  sys_residual.
 +* [Bug 2087] from 4.2.6p5-RC3: sys_jitter calculation overweights
 +  sys.peer jitter.
 +* from 4.2.6p5-RC3: Ensure NULL peer->dstadr is not accessed in orphan
 +  parent selection.
  (4.2.7p237) 2011/12/01 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2050] from 4.2.6p5-RC2: Orphan mode stratum counting to infinity.
  * [Bug 2059] from 4.2.6p5-RC2: optional billboard column "server" does

diff --cc ntpd/ntp_proto.c
Simple merge