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

into  pogo.udel.edu:/pogo/users/murray/bug-1357

bk: 4ae94d94q02xgucn3l1ZP9neuvkmfw

diff --cc ChangeLog
index 0f7f267546b3f7da898da4b2b3337f2a31027aa4,b5b7e1dc1a63782e325be6c29731cc4cc2549c6b..08b19395c8ed69db839aebbde6e332a00fd961e5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
- * [Bug 1357] bogus assert from refclock_shm
++* [Bug 1357] bogus assert from refclock_shm.
+ * [Bug 1359] Debug message cleanup.
+ * CID 101: more pointer/array cleanup.
  * [Bug 1356] core dump from refclock_nmea when can't open /dev/gpsU.
  * [Bug 1358] AIX 4.3 sntp/networking.c IPV6_JOIN_GROUP undeclared.
  * CID 101: pointer/array cleanup.