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

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

bk: 4c37af33sDW8l_0mKstLOkcpEcMWkg

diff --cc ChangeLog
index f23bc6e590345e27070e671d20ae5c53b7baa046,aeac634e992a2025225b096df1ad2003bb8d9747..a0c2f755291bf85f95a267779e3bff4d67b8b791
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,5 +1,10 @@@
-   fixes by Jürgen Perlinger.
+ * [Bug 1395] ease ntpdate elimination with ntpd -w/--wait-sync
+ * [Bug 1396] allow servers on ntpd command line like ntpdate
 +(4.2.7p39) 2010/07/09 Released by Harlan Stenn <stenn@ntp.org>
 +* Fix typo in driver28.html.
 +* [Bug 1581] from 4.2.6p2: size_t printf format string mismatches, IRIG
 +  string buffers undersized.  Mostly backported from earlier ntp-dev
++  fixes by Jürgen Perlinger.
  (4.2.7p38) 2010/06/20 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1570] backported to 4.2.6p2-RC7.
  * [Bug 1575] from 4.2.6p2-RC7: use 'snprintf' with LIB_BUFLENGTH in
@@@ -297,13 -294,6 +299,13 @@@
  * [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".
-   undersized.  Mostly backported from earlier ntp-dev fixes by Jürgen
 +---
 +(4.2.6p2) 2010/07/09 Released by Harlan Stenn <stenn@ntp.org>
 +
 +* [Bug 1581] size_t printf format string mismatches, IRIG string buffers
++  undersized.  Mostly backported from earlier ntp-dev fixes by Jürgen
 +  Perlinger.
 +
  ---
  (4.2.6p2-RC7) 2010/06/19 Released by Harlan Stenn <stenn@ntp.org>