From: Jelte Jansen <jelte@isc.org>
Date: Fri, 25 May 2012 12:50:16 +0000 (+0200)
Subject: [master] Merge remote-tracking branch 'origin/trac1455'
X-Git-Tag: trac2351_base~226^2~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21d3d1aa2eba8be0c5260b562c2804f12951bb7d;p=thirdparty%2Fkea.git

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

21d3d1aa2eba8be0c5260b562c2804f12951bb7d