From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 7 Jul 2004 04:54:47 +0000 (-0400)
Subject: Merge pogo:/usa/mayer/ntp-dev-io
X-Git-Tag: NTP_4_2_3~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=367fc065cfdee794fe9494cb04d33c4f02a8045f;p=thirdparty%2Fntp.git

Merge pogo:/usa/mayer/ntp-dev-io
into whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 40eb8217W_-5XKWkiEaomD8jvnIGHw
---

367fc065cfdee794fe9494cb04d33c4f02a8045f