From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 15 Aug 2005 05:27:24 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acf0ad7c81b82a0d9bf6ea550442fe04cfb62394;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag+
[no longer a merge: surgery done]

bk: 430027bcFdfK-eW3sFDb6tkc2GxSvA
---