From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 31 Mar 2010 07:20:35 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P21~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57c847484bfd23a4872ac4eab4b885ccb742cacd;p=thirdparty%2Fntp.git

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

bk: 4bb2f7c3_M8Rg9hJYPfJjKtosZZIXg
---

57c847484bfd23a4872ac4eab4b885ccb742cacd