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-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43273b5b618b2f09af989d2738fa4be0882c413f;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
---

43273b5b618b2f09af989d2738fa4be0882c413f