From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 15 Nov 2008 00:51:15 +0000 (-0500)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Tag: NTP_4_2_5P142~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39df4a2d71851b70f624255bd45eb3505721e9c8;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn

bk: 491e1d03UYRmh1fmRLCcfd2riQo2yQ
---

39df4a2d71851b70f624255bd45eb3505721e9c8