From: Jeremy C. Reed <jreed@isc.org>
Date: Tue, 21 Jan 2014 21:22:49 +0000 (-0600)
Subject: [2945]Merge branch 'master' into trac2945
X-Git-Tag: bind10-1.2.0beta1-release~124^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd923e85fd2f9bd6ad4dbfbbadae4fb43ff79210;p=thirdparty%2Fkea.git

[2945]Merge branch 'master' into trac2945

fix merge conflicts
---

bd923e85fd2f9bd6ad4dbfbbadae4fb43ff79210