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

into  pogo.udel.edu:/pogo/users/gopal/repos/ntp-dev-610

bk: 48ba3bacBa-n7qSjLr8kwUHKUGsu-A

diff --cc ChangeLog
index ca046a3546b292de536edc32f43a89afcd9e407b,ec01f51de6715c9568dcb462ed768484d574453e..6f54cee4cfda1917f078ad045f691fe8e4dea753
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,9 +1,10 @@@
 +* [BUG 610] Documentation update for NMEA reference clock driver.
+ * [Bug 828] Fix IPv4/IPv6 address parsing.
+ * Changes from Dave Mills:
+   Documentation updates.
+   Fix a corner case where a frequency update was reported but not set.
+   When LEAP_NOTINSYNC->LEAP_NOWARNING, call crypto_update() if we have
+   crypto_flags.
  (4.2.5p125) 2008/08/18 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1052] Add linuxPPS support to ONCORE driver.
  (4.2.5p124) 2008/08/17 Released by Harlan Stenn <stenn@ntp.org>