From: Dave Hart <hart@ntp.org>
Date: Sat, 1 Jan 2011 11:25:34 +0000 (+0000)
Subject: Merge psp-os1.ntp.org:/home/hart/ntp-stable
X-Git-Tag: NTP_4_2_7P109~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1100dcb324e2c674dc75758dc0a6c8834c509ec9;p=thirdparty%2Fntp.git

Merge psp-os1.ntp.org:/home/hart/ntp-stable
into  psp-os1.ntp.org:/home/hart/ntp-dev

bk: 4d1f0f2e8zw0-_tqSP3TKjBOi4LqWA
---

1100dcb324e2c674dc75758dc0a6c8834c509ec9