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

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

bk: 46731ecdTEixWF7ZygEDFZSdALeZHw

diff --cc ChangeLog
index 00e5c120db450d8246f39c755c2e6a0098439a55,c83f3f8492e4ca706bdfc7e2ed6db221a8788e9f..77b0bba3c4d6698b007325677a317bdfdffd429f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
+ * Allow null driftfile.
 +* [Bug 853] get_node() must return a pointer to maximally-aligned memory.
 +* 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.
  * driftfile maintenance changes from Dave Mills.  Use clock_phi instead of

diff --cc ntpd/ntp_util.c
Simple merge