From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 20 Dec 2009 02:52:27 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=491fc32f4d27e9464edd64581452c17e86340216;p=thirdparty%2Fntp.git

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

bk: 4b2d916biCMBAr1LJYe2IIeOhym0EQ
---

491fc32f4d27e9464edd64581452c17e86340216