From: Dave Hart <hart@ntp.org>
Date: Mon, 20 Apr 2009 20:02:53 +0000 (+0000)
Subject: Merge pogo:/pogo/users/mayer/ntp-stable
X-Git-Tag: NTP_4_2_4P7_RC3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c1f031c235cfb57babb7fda9c700e2b8e9783e;p=thirdparty%2Fntp.git

Merge pogo:/pogo/users/mayer/ntp-stable
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1157-58-60-mayer

bk: 49ecd4ed4EeGI1Y3l0euFw8AFVh8xg
---

a9c1f031c235cfb57babb7fda9c700e2b8e9783e
diff --cc ChangeLog
index cecd3d924,8cdacd2a5..8c944e99d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,15 @@@
 +* [Bug 813] Conditional naming of Event
 +* [Bug 1156] lock_thread_to_processor() should be declared in header
 +* [Bug 1147] System errors should be logged to msyslog()
 +* [Bug 787] Bug fixes for 64-bit time_t on Windows
 +
 +
+ ---
+ 
+ * [Bug 1158] support for aix6.1
+ * [Bug 1157] quiet OpenSSL warnings, clean up configure.ac
+ * [Bug 1160] MacOS X is like BSD regarding F_SETOWN
+ 
  ---
  (4.2.4p7-RC2) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>