[master] Merge branch 'trac2187'

author Marcin Siodelski <marcin@isc.org>

Wed, 26 Sep 2012 15:14:53 +0000 (17:14 +0200)

committer Marcin Siodelski <marcin@isc.org>

Wed, 26 Sep 2012 15:14:53 +0000 (17:14 +0200)
author Marcin Siodelski <marcin@isc.org>
Wed, 26 Sep 2012 15:14:53 +0000 (17:14 +0200)
committer Marcin Siodelski <marcin@isc.org>
Wed, 26 Sep 2012 15:14:53 +0000 (17:14 +0200)
diff --cc src/lib/dhcp/iface_mgr.cc
Simple merge
diff --cc tests/tools/perfdhcp/test_control.cc
Simple merge
diff --cc tests/tools/perfdhcp/test_control.h
Simple merge
author	Marcin Siodelski <marcin@isc.org>
	Wed, 26 Sep 2012 15:14:53 +0000 (17:14 +0200)
committer	Marcin Siodelski <marcin@isc.org>
	Wed, 26 Sep 2012 15:14:53 +0000 (17:14 +0200)
		1	2
src/lib/dhcp/iface_mgr.cc	patch \|	diff1 \|	diff2 \|	blob \| history
tests/tools/perfdhcp/test_control.cc	patch \|	diff1 \|	diff2 \|	blob \| history
tests/tools/perfdhcp/test_control.h	patch \|	diff1 \|	diff2 \|	blob \| history