From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 25 May 2011 19:12:04 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1932
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1347104ccc0770ea75fa118ddeeb63ad18ad6d48;p=thirdparty%2Fntp.git

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

bk: 4ddd5484s6cylob3OGQ9_j0zMl_RVg
---

1347104ccc0770ea75fa118ddeeb63ad18ad6d48