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

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

bk: 4b2d94f8D-TZLygK-L7JM6ZzfulNKg
---

652b4516ad50378cb90e13fb6c4c3c8443890263