From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 18 Nov 2005 11:48:52 +0000 (-0500)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1802a32805978719445037fd334f2f8a931ab2ee;p=thirdparty%2Fntp.git

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

bk: 437dbfa40dwoaLclso1witarFnEliQ
---

1802a32805978719445037fd334f2f8a931ab2ee