From: Linux Karlsson <karlsson@ntp.org>
Date: Thu, 26 Aug 2010 11:39:17 +0000 (-0700)
Subject: Merge psp-os1.ntp.org:/home/karlsson/ntp-dev
X-Git-Tag: NTP_4_2_7P75~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd9ba5a967bbc19a38e08b34559006787afb6361;p=thirdparty%2Fntp.git

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

bk: 4c765265DRwKJHoiJ792fNwLDIT-5w
---

bd9ba5a967bbc19a38e08b34559006787afb6361