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-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f94e6824d2bb7734de42ccaf9ef02aaeef6c60d;p=thirdparty%2Fntp.git

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

bk: 4bb44c89r9FTkMLtEmI1EQ5G19yfJg
---

2f94e6824d2bb7734de42ccaf9ef02aaeef6c60d