From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 8 Apr 2004 00:41:48 +0000 (-0400)
Subject: Merge pogo:/usa/mayer/ntp-dev-io
X-Git-Tag: NTP_4_2_3~170^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24ab6d70ac52e8453720a82ce9347277e8b69054;p=thirdparty%2Fntp.git

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

bk: 40749fccl1zicCYSdBf4NERZa6JPkA
---

24ab6d70ac52e8453720a82ce9347277e8b69054