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

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

bk: 4e3b002fEzJJo5kHDxNjDwT_OiZdLQ

diff --cc ChangeLog
index e23576a538d9a1e4caf04378995e0c062acb38af,147909becad45ee8d32b607b93a4340d5b47e5e9..eccff1e6cc14b4b5791413659b842e74969972e3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,10 @@@
+ * sntp: change -h/--headspace to -g/--gap, and change the default gap
+   from 10 to 50ms
++* [Backward Incompatible] from 4.2.6p4: sntp: -l/--filelog ->
++  -l/--logfile, to be consistent with ntpd.
++* From 4.2.6p4: libopts/file.c fix from Bruce Korb (arg-type=file).
 +(4.2.7p200) 2011/08/04 Released by Harlan Stenn <stenn@ntp.org>
 +* Sync with 4.2.6p4-RC2.
  (4.2.7p199) 2011/07/29 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.
  (4.2.7p198) 2011/07/28 Released by Harlan Stenn <stenn@ntp.org>
@@@ -1067,6 -1067,6 +1072,12 @@@
  * [Bug 1414] Enable "make distcheck" success with BSD make.
  (4.2.7) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
++---
++
++* [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be
++  consistent with ntpd.
++* libopts/file.c fix from Bruce Korb (arg-type=file).
++
  ---
  (4.2.6p4-RC2) 2011/08/04 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc sntp/sntp.html
Simple merge