From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 1 Mar 2006 06:34:16 +0000 (-0500)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc61a213c4a30d0b77265fa217440fb4575c73d2;p=thirdparty%2Fntp.git

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

bk: 44054068D6ePLwjjk37XzMIKOm63FQ
---

cc61a213c4a30d0b77265fa217440fb4575c73d2