From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 11 Apr 2006 08:54:31 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cadd128042eceac62726d4e0ff51286b807dd82b;p=thirdparty%2Fntp.git

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

bk: 443b6ec78d1GQ5jXh_sUWqDedNBibw
---

cadd128042eceac62726d4e0ff51286b807dd82b