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

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

bk: 488838814ra5vYu1vuO4ldLx7VG4Wg
---

0004cbba1688d8a1d702f8578a074dbfc985a242