From: Jelte Jansen <jelte@isc.org>
Date: Mon, 2 Apr 2012 09:45:16 +0000 (+0200)
Subject: [master] Merge branch 'trac1535'
X-Git-Tag: trac2351_base~226^2~116^2~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66300a3c4769a48b765f70e2d0dbf8bbb714435b;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1535'
---

66300a3c4769a48b765f70e2d0dbf8bbb714435b