From: Jelte Jansen <jelte@isc.org>
Date: Thu, 22 Mar 2012 13:13:16 +0000 (+0100)
Subject: [master] Merge branch 'trac1293'
X-Git-Tag: trac2351_base~226^2~116^2~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1448f69f1c4e070f05502d67ae4297c248e7658a;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1293'
---

1448f69f1c4e070f05502d67ae4297c248e7658a