From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Fri, 14 Nov 2008 21:34:41 +0000 (+0000)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Tag: NTP_4_2_5P142~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c525672b4f2b9f88a9e5cc809d1e5b55276e84f3;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: 491deef1TZXtfjizdJKQEXeVNXVFiA
---

c525672b4f2b9f88a9e5cc809d1e5b55276e84f3