From: Jelte Jansen <jelte@isc.org>
Date: Fri, 1 Jun 2012 13:17:09 +0000 (+0200)
Subject: [merge_1457] Merge branch 'master' into merge_1457
X-Git-Tag: trac2351_base~226^2~60^2^2~7^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edadf68c0de62bc2dbdce97ff8372f36fd8bec8d;p=thirdparty%2Fkea.git

[merge_1457] Merge branch 'master' into merge_1457
---

edadf68c0de62bc2dbdce97ff8372f36fd8bec8d