From: Linux Karlsson Date: Wed, 18 Aug 2010 20:47:01 +0000 (-0400) Subject: Merge psp-deb1.ntp.org:/home/karlsson/sntp-refactoring-dev X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef6ac2564f7abe2f134b7cc02f88c6331f8c98ad;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/home/karlsson/sntp-refactoring-dev into psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing bk: 4c6c46c5cGTz_dzlyuckoZAPUtMz9g --- ef6ac2564f7abe2f134b7cc02f88c6331f8c98ad