From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 15 Aug 2006 10:12:57 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P31~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8b50d49e6beafc8a5ecaa46f8c3a6dce8c3c420;p=thirdparty%2Fntp.git

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

bk: 44e19e29HRxBasjlwRNXKcNyeNToYA
---

f8b50d49e6beafc8a5ecaa46f8c3a6dce8c3c420