From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 15 Oct 2009 05:40:28 +0000 (-0400)
Subject: Merge bk://maccarony/ntp-dev
X-Git-Tag: NTP_4_2_5P233_RC~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=332adc0b7933e866320b969a16b9eccf4bd677e6;p=thirdparty%2Fntp.git

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

bk: 4ad6b5ccyc348VNqVDt5pMkVMdQWFg
---

332adc0b7933e866320b969a16b9eccf4bd677e6
diff --cc ChangeLog
index 157e56313,7708f0a65..e89f05ef4
--- a/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,...).