From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 10 Aug 2008 06:26:59 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable-hms
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5693d8a32ad2d363d39366c4a2d00404b0506cf;p=thirdparty%2Fntp.git

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

bk: 489e8a33cZtcEzCsdmpVKscl5Xzphg
---

f5693d8a32ad2d363d39366c4a2d00404b0506cf