From: Jelte Jansen <jelte@isc.org>
Date: Mon, 27 Feb 2012 13:16:24 +0000 (+0100)
Subject: [master] Merge branch 'trac1193'
X-Git-Tag: trac2351_base~226^2~116^2~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56b495e4bd8aeffed8642bfb6bb4802ba39a6277;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1193'
---

56b495e4bd8aeffed8642bfb6bb4802ba39a6277