From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 27 Jan 2011 05:51:51 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-tvalops
X-Git-Tag: NTP_4_2_7P126~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d18f645b48c5cfd6f30b4eb1d07ff0358114858;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/hart/ntp-dev-tvalops
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d4107f7KolTFn_FiHOsLq3F7IxiQw
---

7d18f645b48c5cfd6f30b4eb1d07ff0358114858