From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 11 Sep 2010 06:16:11 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P48~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a1241cbc7e957ee1380b3d6a66c07a32cb9016;p=thirdparty%2Fntp.git

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

bk: 4c8b1eabfm--9JclmWY9AD4RZ8cBeA
---

e2a1241cbc7e957ee1380b3d6a66c07a32cb9016