From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 22 Dec 2009 08:47:34 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f27daf244be737777396422a07c167c5ba686b6d;p=thirdparty%2Fntp.git

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

bk: 4b3087a64LtU4PLxIkIrRM5iAbNPpw
---

f27daf244be737777396422a07c167c5ba686b6d