From: Jelte Jansen <jelte@isc.org>
Date: Thu, 13 Sep 2012 12:39:52 +0000 (+0200)
Subject: [master] Merge remote-tracking branch 'origin/trac2151'
X-Git-Tag: trac2351_base~47^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f77fcfce01df67ba90dd9a2708d6926e3065bfd4;p=thirdparty%2Fkea.git

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

f77fcfce01df67ba90dd9a2708d6926e3065bfd4