From: Jelte Jansen <jelte@isc.org>
Date: Fri, 13 Apr 2012 14:16:17 +0000 (+0200)
Subject: [master] Merge branch 'trac1491'
X-Git-Tag: trac2351_base~226^2~116^2~37^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00a36e752802df3cc683023d256687bf222e256a;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1491'
---

00a36e752802df3cc683023d256687bf222e256a