Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1353

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1343-53

bk: 4adf84fbQ6DJEYJa38OzKCsMZAwKDQ

diff --cc ChangeLog
index 4cd60244f80a509362693a0e1cdca77b1dc251ad,04356b1a2ca34e6c2daa00e484a9e747ab7d6ce1..bd006cac248ae3a8e2ddcb8b876a2d45efd6a112
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,4 +1,10 @@@
 +* [Bug 1343] ntpd/ntp_io.c close_fd() does not compile on Solaris 7.
+ * [Bug 1353] ntpq "rv 0 settimeofday" always shows UNKNOWN on unix.
 +* Do not attempt to execute built binaries from ntpd/Makefile when
 +  cross-compiling (keyword-gen and ntpd --saveconfigquit).
 +* sntp/main.c: Remove duplicate global adr_buf[] (also defined in
 +  networking.c) which Piotr Grudzinski identified breaking his build.
 +* Correct in6addr_any test in configure.ac to attempt link too.
  (4.2.5p235-RC) 2009/10/18 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1343] lib/isc build breaks on systems without IPv6 headers.
  (4.2.5p234-RC) 2009/10/16 Released by Harlan Stenn <stenn@ntp.org>