From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 19 Jul 2006 07:11:46 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a257e798c0d5aaeeddb2af30bcf2d1adf3b6d2eb;p=thirdparty%2Fntp.git

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

bk: 44bddb32TTQdIsh36TSAQffac81s2w
---

a257e798c0d5aaeeddb2af30bcf2d1adf3b6d2eb