From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 16 Jun 2006 06:56:49 +0000 (-0400)
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=87cdd3305c6a59dbbb749e04ec5d93bb8201e277;p=thirdparty%2Fntp.git

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

bk: 44925631JrAik6GekK_GqeXxSq3yqg
---

87cdd3305c6a59dbbb749e04ec5d93bb8201e277