From: Jelte Jansen <jelte@isc.org>
Date: Mon, 27 Feb 2012 08:44:11 +0000 (+0100)
Subject: [1678] Merge branch 'master' into trac1678
X-Git-Tag: trac2351_base~226^2~116^2~164^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ba4c6e1f349f890200322b2e2d2ff0e5b179944;p=thirdparty%2Fkea.git

[1678] Merge branch 'master' into trac1678
---

5ba4c6e1f349f890200322b2e2d2ff0e5b179944