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-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834cadae65d87acf69d58aa49aa1d0dbb2a7692b;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
---

834cadae65d87acf69d58aa49aa1d0dbb2a7692b