From: Linux Karlsson <karlsson@ntp.org>
Date: Fri, 30 Jul 2010 10:38:24 +0000 (+0200)
Subject: Merge ntpdeb1:ntp-gsoc-testing
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6471c5f2dee2bfe4e4c28cbabd180a7e7bc925a;p=thirdparty%2Fntp.git

Merge ntpdeb1:ntp-gsoc-testing
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing

bk: 4c52aba0tHOEDOs08lJaIGTn02vq1w
---

f6471c5f2dee2bfe4e4c28cbabd180a7e7bc925a