From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 20 Jul 2006 23:34:25 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dd02bd398023c0d95a2c5c569728bcdcacfff82;p=thirdparty%2Fntp.git

Merge deacon.udel.edu:/deacon/backroom/ntp-stable
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 44c01301bscg80GHkCmWIF9S5flxRQ
---

7dd02bd398023c0d95a2c5c569728bcdcacfff82