From: Stephen Morris <stephen@isc.org>
Date: Thu, 22 Dec 2011 12:08:19 +0000 (+0000)
Subject: Merge branch 'master' into trac1450
X-Git-Tag: perftcpdns_before_epoll~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85083a76107ba2236732b45524ce7018eefbaf90;p=thirdparty%2Fkea.git

Merge branch 'master' into trac1450
---

85083a76107ba2236732b45524ce7018eefbaf90