From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 19 Jun 2010 05:57:56 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-1575
X-Git-Tag: NTP_4_2_6P2_RC7~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67661e08aa7e65d075e82b4834dc5f69fe02d66d;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-1575
into  deacon.udel.edu:/deacon/backroom/ntp-stable-1576

bk: 4c1c5c64KHMGZla8xAxxwbIc1Mgl9w
---

67661e08aa7e65d075e82b4834dc5f69fe02d66d
diff --cc ChangeLog
index ac7f00638,1d2c44dab..668a08362
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
 +* [Bug 1575] use 'snprintf' with LIB_BUFLENGTH in inttoa.c, tvtoa.c and
 +  utvtoa.c
 +
+ ---
+ 
+ * [Bug 1576] sys/sysctl.h depends on sys/param.h on OpenBSD.
+ 
  ---
  (4.2.6p2-RC6) 2010/06/12 Released by Harlan Stenn <stenn@ntp.org>