From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 16 Mar 2004 07:35:18 +0000 (-0500)
Subject: Merge pogo.udel.edu:/pogo/users/mayer/ntp-dev-io
X-Git-Tag: NTP_4_2_3~174^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b520b0865804a393156cc0fc9679224942dfd0fc;p=thirdparty%2Fntp.git

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

bk: 4056ae36QTG6soTT22weVDYRq-1kiA
---

b520b0865804a393156cc0fc9679224942dfd0fc