Merge bk://bk.ntp.org/ntp-dev

into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4e4f28bd1DUJ6LB9efyRDKhpVggSUA

diff --cc ChangeLog
index fa090c5b6a018f6032338f28b1c1fe0df91d7ba1,9cc1967b79ea4f9dd1368501994401e00b5faea5..16a2a4f10b19095cdcf1b5ac8c954e02b6615a74
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
 +* [Bug 1993] ntpd Windows port adj_systime() broken in 4.2.7p203.
+ * sntp documentation and behavior improvements suggested by
+   Steven Sommars.
+ * Have sntp report synchronization distance instead of root dispersion.
+ * Clean up ntp-wait-opts.def .
  (4.2.7p205) 2011/08/19 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1992] util/tg2 doesn't compile, needs libntp.
  (4.2.7p204) 2011/08/16 Released by Harlan Stenn <stenn@ntp.org>