From: Linux Karlsson <karlsson@ntp.org>
Date: Fri, 29 Oct 2010 15:01:40 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
X-Git-Tag: NTP_4_2_7P75~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a52c528cdf941a1471e4fc0c61a4d3b96660591;p=thirdparty%2Fntp.git

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

bk: 4ccae1d47ygFJssONrHPeV7dAQ6wWA
---

3a52c528cdf941a1471e4fc0c61a4d3b96660591