Merge bk://maccarony/ntp-dev

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

bk: 4ad6b5ccyc348VNqVDt5pMkVMdQWFg

diff --cc ChangeLog
index 157e56313f0e57a4eae9f86285608ce0f9036548,7708f0a6557bf9f87addbc5e62d894e162c5451a..e89f05ef44b409d6592c5d3ae195a0d9dad6178c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 +* [Bug 1337] cast setsockopt() v4 address pointer to void *.
 +* [Bug 1342] ignore|drop one IPv6 address on an interface blocks all
 +  addresses on that interface.
+ * Documentation cleanup and updates.
  (4.2.5p232-RC) 2009/10/14 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1302] OpenSSL under Windows needs applink support.
  * [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...).