Merge bk://maccarony/ntp-dev

into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1586

bk: 4c4f9ed3ec9qp7z0xGbiZdfmcYgcHg

diff --cc ChangeLog
index ec3c7bad93c0ff48193d7ccde03fcb6a3334ada2,2b2bd22de16f7e821e4ccd1e036c59a3993ba4f1..9cf9b64d0b04c157a519f4f4435d29b859dbad08
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 +* [Bug 1586] ntpd 4.2.7p40 doesn't write to syslog after fork on QNX.
 +* Avoid race with parallel builds using same source directory in
 +  scripts/genver by using build directory for temporary files.
+ * orphanwait documentation updates.
  (4.2.7p40) 2010/07/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1395] ease ntpdate elimination with ntpd -w/--wait-sync
  * [Bug 1396] allow servers on ntpd command line like ntpdate