From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 7 Jan 2011 09:19:30 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6611708a590ee85f077b90d259b9cc02cf8d8e8;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: 4d26daa2zMcMfgxFLs-xRkOCXDerTg
---

e6611708a590ee85f077b90d259b9cc02cf8d8e8