From: Linux Karlsson Date: Thu, 26 Aug 2010 11:39:17 +0000 (-0700) Subject: Merge psp-os1.ntp.org:/home/karlsson/ntp-dev X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eba7f4efbc5061c5d0dd62c813f3ec1ab7a7834;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 --- 2eba7f4efbc5061c5d0dd62c813f3ec1ab7a7834