From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 13 Dec 2005 04:52:03 +0000 (-0500)
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=97168f4e83baed1eb084e7ca28c4e63d749c539e;p=thirdparty%2Fntp.git

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

bk: 439e53733dpZSdMXbChMdV8RzYMRjw
---

97168f4e83baed1eb084e7ca28c4e63d749c539e