From: Harlan Stenn Date: Fri, 29 Oct 2010 00:04:27 +0000 (-0700) Subject: Merge stenn.ntp.org:/home/karlsson/ntp-dev X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=389d87bfddfe1c5ce5231200caa58add54b500e7;p=thirdparty%2Fntp.git Merge stenn.ntp.org:/home/karlsson/ntp-dev into stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/ntp-gsoc-testing bk: 4cca0f8bA5MeOkgmJb-yVEO4AYFuKQ --- 389d87bfddfe1c5ce5231200caa58add54b500e7