From: Jeremy C. Reed <jreed@ISC.org>
Date: Thu, 16 Feb 2012 20:31:46 +0000 (-0600)
Subject: [trac1687]Merge branch 'master' into trac1687
X-Git-Tag: trac2351_base~97^2~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff1bfb9f63bdebb1cc96b3fd7b02633cfef0f936;p=thirdparty%2Fkea.git

[trac1687]Merge branch 'master' into trac1687
---

ff1bfb9f63bdebb1cc96b3fd7b02633cfef0f936