From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 28 Dec 2006 08:23:29 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_5~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd652f45f45b5466f9ad7ab4cd7e3ec4ac848e58;p=thirdparty%2Fntp.git

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

bk: 45937f01sEI4VMLskDoiUdUdAjkl2g
---

dd652f45f45b5466f9ad7ab4cd7e3ec4ac848e58