From: Jelte Jansen <jelte@isc.org>
Date: Fri, 11 May 2012 10:49:49 +0000 (+0200)
Subject: [nsec_merge] Merge branch 'trac1803' into nsec_merge
X-Git-Tag: trac2351_base~226^2~159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ea901973b1eeb7bfe5e20768eaffb368d1dab99;p=thirdparty%2Fkea.git

[nsec_merge] Merge branch 'trac1803' into nsec_merge
---

9ea901973b1eeb7bfe5e20768eaffb368d1dab99