From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 12 Dec 2011 19:13:19 +0000 (+0100)
Subject: Merge branch 'trac992' into trac1237
X-Git-Tag: trac2351_base~299^2~6^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1a22e481da930ca3151ce704305d7995f9d8fcc;p=thirdparty%2Fkea.git

Merge branch 'trac992' into trac1237
---

d1a22e481da930ca3151ce704305d7995f9d8fcc