From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Thu, 24 Jul 2008 07:01:24 +0000 (+0900)
Subject: Merge kuehn@pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn/
X-Git-Tag: NTP_4_2_5P142~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834ffb2345feedcda0f095689299c3a25ee37189;p=thirdparty%2Fntp.git

Merge kuehn@pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn/
into  yumi.mxiesoft.com:/geom_mobile/home/Amidamaru/projects/sntp/repo/ntp-dev

bk: 488828calVOD0pdO-JBhVpyQKbBpdg
---

834ffb2345feedcda0f095689299c3a25ee37189