From: Linux Karlsson <karlsson@ntp.org>
Date: Fri, 4 Jun 2010 08:53:38 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea0d812016c4fb6b5ce2e0fc6fe63d2bf363f149;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c08bf12JD5vlwbmsNmRX-Dttq6-2A
---

ea0d812016c4fb6b5ce2e0fc6fe63d2bf363f149