From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Tue, 29 Jul 2008 23:05:34 +0000 (+0000)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn
X-Git-Tag: NTP_4_2_5P142~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66528fdfe37124869a42d82509c379d1a7120f9b;p=thirdparty%2Fntp.git

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

bk: 488fa23e0lncQgSvtQmV8LxtAY6NLg
---

66528fdfe37124869a42d82509c379d1a7120f9b