From: Dima Volodin <dvv@isc.org>
Date: Tue, 11 Oct 2011 10:53:16 +0000 (-0400)
Subject: Merge branch 'trac1138' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1138
X-Git-Tag: perftcpdns_before_epoll~37^2~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46230c83bb8d70e170fe77e9e936765014b762d2;p=thirdparty%2Fkea.git

Merge branch 'trac1138' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1138

Conflicts:
	src/lib/dns/tests/rdata_dhcid_unittest.cc
---

46230c83bb8d70e170fe77e9e936765014b762d2