From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 10 Aug 2008 00:20:19 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-dev-hms2
X-Git-Tag: NTP_4_2_5P123~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8039c6695265fe7b467c4d3c9d6f90cdc9f339d5;p=thirdparty%2Fntp.git

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

bk: 489e3443j9R53tQgb8BufoFuT8Noww
---

8039c6695265fe7b467c4d3c9d6f90cdc9f339d5