From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Sun, 27 Jul 2008 19:40:43 +0000 (+0000)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn
X-Git-Tag: NTP_4_2_5P142~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b5b3869a0cb2d87597acb725f977a6c4d8e799d;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: 488ccf3bD-j9n8cmegN0uwlLdyyRpA
---

8b5b3869a0cb2d87597acb725f977a6c4d8e799d