[1553] Merge branch 'trac1553' of ssh://git.bind10.isc.org/var/bind10/git/bind10...

author Jelte Jansen <jelte@isc.org>

Fri, 20 Jan 2012 09:56:48 +0000 (10:56 +0100)

committer Jelte Jansen <jelte@isc.org>

Fri, 20 Jan 2012 09:56:48 +0000 (10:56 +0100)
author Jelte Jansen <jelte@isc.org>
Fri, 20 Jan 2012 09:56:48 +0000 (10:56 +0100)
committer Jelte Jansen <jelte@isc.org>
Fri, 20 Jan 2012 09:56:48 +0000 (10:56 +0100)
diff --cc tests/lettuce/features/resolver_basic.feature
Simple merge
author	Jelte Jansen <jelte@isc.org>
	Fri, 20 Jan 2012 09:56:48 +0000 (10:56 +0100)
committer	Jelte Jansen <jelte@isc.org>
	Fri, 20 Jan 2012 09:56:48 +0000 (10:56 +0100)