From: Jelte Jansen <jelte@isc.org>
Date: Mon, 26 Mar 2012 08:44:21 +0000 (+0200)
Subject: [master] Merge branch 'trac1172'
X-Git-Tag: trac2351_base~226^2~116^2~66^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bec26c6137c9b0a59a3a8ca0f55a17cfcb8a23de;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1172'
---

bec26c6137c9b0a59a3a8ca0f55a17cfcb8a23de