From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 25 Dec 2009 06:09:56 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P5~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f93c11321861b319861a10acc2056ea8f6d121d7;p=thirdparty%2Fntp.git

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

bk: 4b345734C-jlBJAG6-JPxDkXnk82fQ
---

f93c11321861b319861a10acc2056ea8f6d121d7