From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 15 Jan 2006 08:36:01 +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=4be13e4b458bf3f469431fb8a009a7d81513239b;p=thirdparty%2Fntp.git

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

bk: 43ca0971bnLfwe_XuKw3SudVJO6VlQ
---

4be13e4b458bf3f469431fb8a009a7d81513239b