From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 13 Dec 2009 01:22:43 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ccf41896cac3740c8b7d5bbd1d3564c8ad195c4;p=thirdparty%2Fntp.git

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

bk: 4b2441e3mfKfgcjoOfStfjOk2wQW0w
---

3ccf41896cac3740c8b7d5bbd1d3564c8ad195c4