From: Linux Karlsson <karlsson@ntp.org>
Date: Thu, 26 Aug 2010 10:13:36 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
X-Git-Tag: NTP_4_2_7P75~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8a169bc05376dce8feffa7a2bdec6d16e6238be;p=thirdparty%2Fntp.git

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

bk: 4c763e50G_rSKy-NRS7oZFxGi_3NWQ
---

e8a169bc05376dce8feffa7a2bdec6d16e6238be