From: Jelte Jansen <jelte@isc.org>
Date: Fri, 16 Mar 2012 09:25:38 +0000 (+0100)
Subject: [master] Merge branch 'trac1640_2'
X-Git-Tag: trac2351_base~226^2~116^2~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=582bcd66dbd8d39f48aef952902f797260280637;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1640_2'
---

582bcd66dbd8d39f48aef952902f797260280637