From: Linux Karlsson Date: Thu, 19 Aug 2010 09:29:04 +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=acaa5dc52503c947ee4090ae56bc212828b61443;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev into psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing bk: 4c6cf960Bsm4UwUz7rfoearyI5PLXA --- acaa5dc52503c947ee4090ae56bc212828b61443