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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-663-1292

bk: 4aab8c74S-BbVqhmXw7EQLl8a_YfwA

diff --cc ChangeLog
index c64a826fdb55f90ff1875924f025cc3b5d01f80f,63626a85cf3e5e56aa30dd6aaac0916144e94f94..2ad591217051eb0a00a1b160f2da5338fdcf06de
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 663] respect ntpq -c and -p order on command line.
+ * [Bug 1292] more VC6 unsigned __int64 workarounds.
  (4.2.5p210) 2009/09/06 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1294] Use OPENSSL_INC and OPENSSL_LIB macros for Windows
    and remove unnecessary reference to applink.c for Windows