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

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

bk: 467861b8aFkL4G2qewzlI3fhF0aqqw

diff --cc ChangeLog
index 7453dd2dab67701e6f38449138890ecb2d2af4e9,f4c24d209f6922b6941496fb87898295142ddd9e..7fb7b54042cc81145af62bedfef7f91e6fc2a90f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* 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 853] get_node() must return a pointer to maximally-aligned memory.