From: Jelte Jansen <jelte@isc.org>
Date: Wed, 14 Mar 2012 16:53:38 +0000 (+0100)
Subject: [master] Merge branch 'trac1321'
X-Git-Tag: trac2351_base~226^2~116^2~126^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bb258f8610620191d75cfd5d2308b6fc558c280;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1321'
---

0bb258f8610620191d75cfd5d2308b6fc558c280