From: Johannes Maximilian Kuehn <kuehn@ntp.org>
Date: Fri, 14 Nov 2008 21:34:41 +0000 (+0000)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27835eec18a56e7cd9552347f7baa8d2f8fce081;p=thirdparty%2Fntp.git

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

bk: 491deef1TZXtfjizdJKQEXeVNXVFiA
---

27835eec18a56e7cd9552347f7baa8d2f8fce081