From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 Oct 2010 05:41:01 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P62~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9d4ecb9644f718baf33d6af1d9998e1e2cfb5e0;p=thirdparty%2Fntp.git

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

bk: 4cb3f4edqzqQhaJuoMeS3QyFCGdT7Q
---

c9d4ecb9644f718baf33d6af1d9998e1e2cfb5e0