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

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

bk: 4b0e1a71uCXgGxX3KfPni-52aq29Pw

diff --cc ChangeLog
index 2e96bac71e8c4966cca5c1a39635a47e91301aa1,c122d04d9ac6d496801ea3a47704a0abbbea849b..64e76f6d512c25b0d6b8db6852eaea9b35d6b166
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,4 +1,9 @@@
+ * [Bug 1397] shmget() refclock_shm failing because of file mode
 +* [Bug 1387] Storage leak in ntp_intres (minor).
 +* [Bug 1389] buffer overflow in refclock_oncore.c
 +* [Bug 1391] .texi usage text from installed, not built binaries.
 +* [Bug 1392] intres retries duplicate assocations endlessly.
 +* Correct *-opts.h dependency so default 'get' action isn't used.
  (4.2.5p247-RC) 2009/11/20 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1142] nodebug builds shed no light on -d, -D option failure.
  * [Bug 1179] point out the problem with -i/--jaildir and -u/--user when