From: Jelte Jansen <jelte@isc.org>
Date: Mon, 24 Sep 2012 07:44:14 +0000 (+0200)
Subject: [master] Merge remote-tracking branch 'origin/trac2190'
X-Git-Tag: trac2351_base~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0ffa11d49ab949ee5a4ffe7682b0e6906667baa;p=thirdparty%2Fkea.git

[master] Merge remote-tracking branch 'origin/trac2190'
---

e0ffa11d49ab949ee5a4ffe7682b0e6906667baa