From: Stephen Morris <stephen@isc.org>
Date: Thu, 19 Apr 2012 11:12:36 +0000 (+0100)
Subject: [master] Merge branch 'trac1704'
X-Git-Tag: trac2351_base~226^2~116^2~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8e538c10d73ea56f079fcb8f3c6f99e5407bdef;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1704'
---

c8e538c10d73ea56f079fcb8f3c6f99e5407bdef