From: Stephen Morris <stephen@isc.org>
Date: Mon, 12 Nov 2012 17:16:07 +0000 (+0000)
Subject: [2342] Merge branch 'master' into trac2342
X-Git-Tag: trac2487_base~1^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7defffb89bd0f3fdd7ad2437c78950bcb86ad37;p=thirdparty%2Fkea.git

[2342] Merge branch 'master' into trac2342
---

c7defffb89bd0f3fdd7ad2437c78950bcb86ad37