From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 21 Dec 2010 09:56:02 +0000 (-0500)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P100~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=618069308651c414eb6bd7339392bd6b37cd556d;p=thirdparty%2Fntp.git

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

bk: 4d1079b2aStB8h1nEhZjIaxuQUhBrw
---

618069308651c414eb6bd7339392bd6b37cd556d