From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 24 Jun 2006 20:13:51 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e79baeef2023295fe60a2bb8f1127a847ac2037c;p=thirdparty%2Fntp.git

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

bk: 449d9cffoGcnk2Ghac3ocxJ7sbo3Lg
---

e79baeef2023295fe60a2bb8f1127a847ac2037c