From: Jelte Jansen <jelte@isc.org>
Date: Mon, 6 Aug 2012 07:32:06 +0000 (+0200)
Subject: [master] Merge branch 'trac2126'
X-Git-Tag: trac2351_base~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ecb73e5bf38c5dc4efad44aac0331e487829d89;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2126'
---

1ecb73e5bf38c5dc4efad44aac0331e487829d89