From: Juergen Perlinger <perlinger@ntp.org>
Date: Tue, 18 Jan 2011 17:10:34 +0000 (+0100)
Subject: Merge perlinger@psp-deb1.ntp.org:ntp-dev-timeops
X-Git-Tag: NTP_4_2_7P120~8^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc735505790e01b7258ccfb7829c510a5f3f1ef;p=thirdparty%2Fntp.git

Merge perlinger@psp-deb1.ntp.org:ntp-dev-timeops
into  hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-dev-timeops

bk: 4d35c98aYnBdrP-rruRfRbAU1yMHRA
---

2dc735505790e01b7258ccfb7829c510a5f3f1ef