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

into  pogo.udel.edu:/pogo/users/murray/bug-1310a

bk: 4ab0aa9e9gae0LjcOvB9yQ2cCXHBmw

diff --cc ChangeLog
index ab864a7efea0264a91ac9d417b5192cb0eec58d6,b52342e3b6bcb9071551cc4c56d2e9c28e95fc78..59c6d7ae17a280242efc2d4417da6f5d7ed3d989
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * [Bug 1310] fix Thunderbolt mode in refclock_palisade.c
 +(4.2.5p212) 2009/09/15 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 983] add interface [listen | ignore | drop] ... directive.
  * [Bug 1243] MD5auth_setkey zero-fills key from first zero octet.
  * [Bug 1295] leftover fix, do not crash on exit in free_config_trap()