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

[master] Merge branch 'trac1717'
---

30d7686cb6e2fa64866c983e0cfb7b8fabedc7a2