From: Danny Mayer <mayer@ntp.org>
Date: Thu, 22 Jul 2004 04:13:13 +0000 (-0400)
Subject: Merge mayer@pogo.udel.edu:ntp-dev-io into tecotoo.:H:/ntpbk/ntp-dev
X-Git-Tag: NTP_4_2_3~156^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cac0e678b26c194d2d99162c8ee8d1fbe8463f3d;p=thirdparty%2Fntp.git

Merge mayer@pogo.udel.edu:ntp-dev-io into tecotoo.:H:/ntpbk/ntp-dev

bk: 40ff3ed9G5jiiyNmCetRTsZNnZH5Qg
---

cac0e678b26c194d2d99162c8ee8d1fbe8463f3d