From: Linux Karlsson <karlsson@ntp.org>
Date: Wed, 28 Jul 2010 16:19:25 +0000 (+0200)
Subject: Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-stable-1595
X-Git-Tag: NTP_4_2_7P42~1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62daef1e656c53912d111215cc43c4a0cd1475c9;p=thirdparty%2Fntp.git

Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-stable-1595
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-dev-1595

bk: 4c50588dRm1mERFL2N8tJRdP2ghRQw
---

62daef1e656c53912d111215cc43c4a0cd1475c9