From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 17 Dec 2010 03:32:32 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1757
X-Git-Tag: NTP_4_2_7P95~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1c2833643ecf7eb3d2250e1b4f7ee626c194a16;p=thirdparty%2Fntp.git

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

bk: 4d0ad9d04NveEn4vGs6GUHChK_d82Q
---

e1c2833643ecf7eb3d2250e1b4f7ee626c194a16