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-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5caa46ac8cead9150abedc95eb6438d1cfc2b195;p=thirdparty%2Fntp.git

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

bk: 4b1f3343MTxgp5eiw59LrtAounuugQ
---

5caa46ac8cead9150abedc95eb6438d1cfc2b195