From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 11 Sep 2008 00:27:06 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Tag: NTP_4_2_5P142~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8475f51e1dc270c23a724f3100c904e3feccbdb1;p=thirdparty%2Fntp.git

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

bk: 48c865daq9fSzctny317CGzv3sqX2g
---

8475f51e1dc270c23a724f3100c904e3feccbdb1