Merge pogo:/pogo/users/mayer/ntp-stable

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

bk: 49ecd4ed4EeGI1Y3l0euFw8AFVh8xg

diff --cc ChangeLog
index cecd3d924d18182e8d8697293fed536baac3fd15,8cdacd2a561752db165bdac59c7ffec569af97f5..8c944e99d7ca5135c0c3bea229e65145343357a7
--- 1/ChangeLog
--- 2/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>