From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 1 Apr 2010 07:34:33 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P22~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829394b2ccbd08a2333ee9d8d9f9258b0883a6af;p=thirdparty%2Fntp.git

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

bk: 4bb44c89r9FTkMLtEmI1EQ5G19yfJg
---

829394b2ccbd08a2333ee9d8d9f9258b0883a6af