From: Reg Clemens <clemens@ntp.org>
Date: Sun, 10 Aug 2008 22:32:17 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/clemens/ntp-stable
X-Git-Tag: NTP_4_2_5P125~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d439aae67a4eaefc9ecb8a142187a436cefdcac;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/clemens/ntp-stable
into  pogo.udel.edu:/pogo/users/clemens/ntp-dev

bk: 489f6c71gvEjOSLE6vnHfmYWn7Pkaw
---

1d439aae67a4eaefc9ecb8a142187a436cefdcac