From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 9 Dec 2009 05:18:59 +0000 (-0500)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dea8d935856a195eb4d6f8c6d678875898f82e9;p=thirdparty%2Fntp.git

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

bk: 4b1f3343MTxgp5eiw59LrtAounuugQ
---

4dea8d935856a195eb4d6f8c6d678875898f82e9