From: Linux Karlsson <karlsson@ntp.org>
Date: Mon, 20 Sep 2010 12:36:30 +0000 (+0200)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P75~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81f6f4b2c4c76526e6bc406c6d82d1ed76a01fe2;p=thirdparty%2Fntp.git

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

bk: 4c97554el9Qw7hGrMBgfMk1iBL3zcQ
---

81f6f4b2c4c76526e6bc406c6d82d1ed76a01fe2