From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 22 Feb 2011 05:47:05 +0000 (-0500)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P132~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25266fd21ef67e41627303a887918f23564879a1;p=thirdparty%2Fntp.git

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

bk: 4d634dd9muaa2wIPL03No62MXSPmNw
---

25266fd21ef67e41627303a887918f23564879a1