Merge psp-deb1.ntp.org:../hart/ntp-dev-2048

into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4f4b14635JZNF2Zagm21oMSpzrvRmw

diff --cc ChangeLog
index c2f667d15c2fe0d727e56c8d6d6812a5a18de722,c41fbdde7473a5650827a0fb8bafec3afb603ae0..c9c6b8faaf93ee9405f2857888059811f9bee56f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 2048] add the clock variable timecode to SHM refclock.
+ (4.2.7p260) 2012/02/24 Released by Harlan Stenn <stenn@ntp.org>
  * Fix the check-scm-rev invocation in several Makefile.am's.
  (4.2.7p259) 2012/02/22 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2148] ntpd 4.2.7p258 segfault with 0x0100000 bit in NMEA mode.