From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 30 Mar 2009 08:09:04 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_5P160~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7217be63398596cad0435d1a648d2233aca0d41;p=thirdparty%2Fntp.git

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

bk: 49d07e201_Umqhs-9gALbyOIPTwk_Q
---

f7217be63398596cad0435d1a648d2233aca0d41