Merge bk://www.ntp.org/ntp-dev

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

bk: 4aae0d28KmVdSW9tqIJ3rAyIHLNNGQ

diff --cc ChangeLog
index 50c970e841edd25092a47404bb4d4152563f9f13,2ad591217051eb0a00a1b160f2da5338fdcf06de..8a040b87a2975b59c8d38bcbe7227cb79ab1a1c0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 663] respect ntpq -c and -p order on command line.
+ * [Bug 1292] more VC6 unsigned __int64 workarounds.
 +* [Bug 1296] Added Support for Trimble Acutime Gold.
  (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