From: Linux Karlsson <karlsson@ntp.org>
Date: Wed, 18 Aug 2010 20:45:34 +0000 (+0200)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P43~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f50b2d94b55cbc7fd1948dafb47e6ae2a2569a3b;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/sntp-refactoring-dev

bk: 4c6c466el-qTI6Jb-f9_Nf02a9kyrA
---

f50b2d94b55cbc7fd1948dafb47e6ae2a2569a3b