From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 11 Dec 2012 21:06:19 +0000 (-0800)
Subject: [2429] Merge remote-tracking branch 'origin/trac2428' into trac2429
X-Git-Tag: bind10-1.0.0-beta-release~16^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1649bf2b29e4770739fdc517c4e0d98253dfbe0d;p=thirdparty%2Fkea.git

[2429] Merge remote-tracking branch 'origin/trac2428' into trac2429
resolving conflicts in:
	src/lib/dns/master_loader.cc
---

1649bf2b29e4770739fdc517c4e0d98253dfbe0d