From: Kean Johnston <kean@isc.org>
Date: Sat, 25 Jan 2014 11:37:13 +0000 (+0200)
Subject: Merge branch 'trac2904_v3'
X-Git-Tag: bind10-1.2.0beta1-release~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e0781ef76bd2912ea0f227192fa020041a4b7f4;p=thirdparty%2Fkea.git

Merge branch 'trac2904_v3'
---

5e0781ef76bd2912ea0f227192fa020041a4b7f4