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

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

bk: 4b1f65050O0x-qVakBSne-FbhK9o3w
---

5a5ffa781a0a73ebb718a41133701baef1b77ea1