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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1135-1333

bk: 4acac5b3v6kxxso77OQJPfGd6PkB8Q

diff --cc ChangeLog
index 69260bc40e168c5447b4c3393f58279fac770e57,8274b8652b52b013e318faa9ae97fc521c74dca4..c95a895fc4eabcab0956737ab0de76998369fedc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * [Bug 1135] ntpq uses sizeof(u_long) where sizeof(u_int32) is meant.
 +* [Bug 1333] ntpd --interface precedence over --novirtualips lost.
  (4.2.5p227) 2009/10/05 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1135] :config fails with "Server disallowed request"
  * [Bug 1330] disallow interface/nic rules when --novirtualips or