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

into  pogo.udel.edu:/pogo/users/neal/neal.ntp-dev

bk: 468206aclWlx6DSMu-zrt6wSHxC2PA

diff --cc ChangeLog
index e3aa3009e866f70d248017683edb966f33eb42ea,c48aabc219ca66e2aca7aa309292b2da49470387..1d2965ba4e6aba2fbaef3ad279e82259b7ba25fb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,14 +1,15 @@@
 +* [Bug 862] includefile nesting; preserve phonelist on reconfig.
+ * [Bug 604] ntpd regularly dies on linux/alpha.
+ * more leap second infrastructure fixes from Dave Mills.
+ * [Bug 858] recent leapfile changes broke non-OpenSSL builds.
+ * Use emalloc() instead of malloc() in refclock_datum.c (Calysto).
+ * Start using 'design by contract' assertions.
+ * [Bug 767] Fast sync to refclocks wanted.
  * Allow null driftfile.
- * More leap second fixes from Dave Mills.
  * Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.
- * [Bug #629] changes to ensure broadcast works including on wildcard addresses
+ * [Bug 629] changes to ensure broadcast works including on wildcard addresses
  * [Bug 853] get_node() must return a pointer to maximally-aligned memory.
- * Leap file fixes from Dave Mills.
+ * Initial leap file fixes from Dave Mills.
  * [Bug 858] Recent leapfile changes broke without OPENSSL.
  * Use a char for DIR_SEP, not a string.
  * [Bug 850] driftfile parsing changes.

diff --cc ntpd/ntp_config.c
Simple merge