From: Danny Mayer <mayer@ntp.org>
Date: Fri, 26 Aug 2005 21:13:24 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/mayer/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92330cb55cee73e016533eaf07df8b90442cbbe1;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/mayer/ntp-dev
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev-dyn

bk: 430f85f4UBL5MwzFrPIzmxVkWyQ4EA
---

92330cb55cee73e016533eaf07df8b90442cbbe1