From: Linux Karlsson Date: Thu, 26 Aug 2010 10:13:36 +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=d160ee7ee0b230face4e612bc280512531496c09;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 --- d160ee7ee0b230face4e612bc280512531496c09