From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Thu, 24 Jul 2008 07:56:57 +0000 (+0000)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn
X-Git-Tag: NTP_4_2_5P142~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d9dfe47ba3e2f2981607afdef852d2a59197b5d;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: 488835c9yBKLCFOM1PNRVzfg0mlFew
---

5d9dfe47ba3e2f2981607afdef852d2a59197b5d