From: Linux Karlsson Date: Sun, 13 Jun 2010 14:07:18 +0000 (-0400) Subject: Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e987167b5ce5656299f428ff5a15c6b49ee5f470;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev into psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing bk: 4c14e616vYJhxq56otiwc0U7Gll2tA --- e987167b5ce5656299f428ff5a15c6b49ee5f470