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

into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 5021c8a7z25Yh0p9BYiJOsbVI8ld7A

diff --cc ChangeLog
index d81fcab4d361755117b8289a1b957bad9628b2d2,f99e79adac6883d8f5015082c0c9799a95535651..e4aa23ae04dafbe8cd080c4b3b939c2adfa4d006
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
+ * [Bug 2242] configure fails to detect getifaddrs function on Solaris.
+ * [Bug 2249] Bad operator for 'test' in 'make check' of libevent.
+ * [Bug 2252] palisade: formats nanosecs to a 6-char field.
+ * Attempt to resolve strict-aliasing violation in refclock_tsyncpci.c.
 +* Fix && -> & typo in refclock_palisade.c debug statements.
  (4.2.7p293) 2012/08/04 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.
  * Documentation cleanup from Mike T.

diff --cc ntpd/refclock_palisade.c
Simple merge