From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Tue, 22 Jul 2008 20:59:41 +0000 (+0000)
Subject: Merge kuehn@pogo.udel.edu:/usa/stenn/ntp-dev-kuehn
X-Git-Tag: NTP_4_2_5P142~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe294ac3e95a966d37482916c8da616c492985e;p=thirdparty%2Fntp.git

Merge kuehn@pogo.udel.edu:/usa/stenn/ntp-dev-kuehn
into  pogo.udel.edu:/pogo/users/kuehn/repo/ntp-dev

bk: 48864a3d67kgzgGxrpNwX7qQzpT77w
---

8fe294ac3e95a966d37482916c8da616c492985e