From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 15 Nov 2008 00:53:35 +0000 (-0500)
Subject: Merge pogo.udel.edu:/pogo/users/kuehn/rsync_repo/ntp-dev
X-Git-Tag: NTP_4_2_5P142~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52a798f24e67131e6f5c026ea7d34d0f33303649;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/kuehn/rsync_repo/ntp-dev
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn

bk: 491e1d8fftWPXc4G6lrEHm1Zd-3I6w
---

52a798f24e67131e6f5c026ea7d34d0f33303649