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

into  pogo.udel.edu:/pogo/users/kuehn/ntp-dev-max

bk: 49462303MpHoE_v4Jnh2QmlO2umX0w

diff --cc ChangeLog
index 542b700279136d2adb4c839b3b2d77675645efe5,ca4d7149899d58217fe89f58e84011850745aa1f..6ba32b348d39c94590e561dd3a412d34444f010c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,13 +1,14 @@@
- * Fixed wrong behaviour in sntp's crypto.c (bug #1099).
++* [Bug 1099] Fixed wrong behaviour in sntp's crypto.c.
+ * [Bug 1103] Fix 64-bit issues in the new calendar code.
+ (4.2.5p149) 2008/12/05 Released by Harlan Stenn <stenn@ntp.org>
+ * Fixed mismatches in data types and OID definitions in ntpSnmpSubAgent.c
+ * added a premliminary MIB file to ntpsnmpd (ntpv4-mib.mib)
+ (4.2.5p148) 2008/12/04 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1070] Fix use of ntpq_parsestring() in ntpsnmpd.
+ (4.2.5p147) 2008/11/27 Released by Harlan Stenn <stenn@ntp.org>
+ * Update gsoc_sntp's GCC warning code.
+ (4.2.5p146) 2008/11/26 Released by Harlan Stenn <stenn@ntp.org>
+ * Update Solaris CFLAGS for gsoc_sntp.
  (4.2.5p145) 2008/11/20 Released by Harlan Stenn <stenn@ntp.org>
  * Deal with time.h for sntp under linux.
  * Provide rpl_malloc() for sntp for systems that need it.