From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 21 Dec 2010 08:15:35 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-stable-msyslog
X-Git-Tag: NTP_4_2_7P100~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a126758372684e3e04471c8f34a799abd17f614f;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/hart/ntp-stable-msyslog
into  deacon.udel.edu:/deacon/backroom/ntp-stable

bk: 4d106227Q_s-ClvPx04khL6yfwvsKg
---

a126758372684e3e04471c8f34a799abd17f614f