From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Fri, 5 Sep 2008 00:38:42 +0000 (+0000)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn
X-Git-Tag: NTP_4_2_5P142~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0bdb90324748fa6a2b7ca6007fdbd1f7b5d4d85;p=thirdparty%2Fntp.git

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

bk: 48c07f92MOMRFwo45-CEkxen5dGc3Q
---

b0bdb90324748fa6a2b7ca6007fdbd1f7b5d4d85