From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 7 Jan 2011 23:21:47 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-dev
X-Git-Tag: NTP_4_2_7P131~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f26c986dbaf4102e19d7e001318b809ddda01d3;p=thirdparty%2Fntp.git

Merge psp-fb1.ntp.org:/home/stenn/ntp-dev
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-libevent

bk: 4d27a00bxSaSzl_qelBmk05p6fvEnw
---

2f26c986dbaf4102e19d7e001318b809ddda01d3