From: Jelte Jansen <jelte@isc.org>
Date: Fri, 1 Jul 2011 07:52:08 +0000 (+0200)
Subject: Merge branch 'trac760'
X-Git-Tag: perftcpdns_before_epoll~231^2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1eb10de8b47aaab24b48cb0e109cf2a3bbc22860;p=thirdparty%2Fkea.git

Merge branch 'trac760'
---

1eb10de8b47aaab24b48cb0e109cf2a3bbc22860