From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 29 Dec 2010 07:45:36 +0000 (-0500)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P105~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6f136626f3b0515de3ccd0432a2023d0ba4b5e1;p=thirdparty%2Fntp.git

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

bk: 4d1ae7202BZOMmVCEFYdkw7A1khjbw
---

a6f136626f3b0515de3ccd0432a2023d0ba4b5e1