Merge branch 'trac1281'

author Tomek Mrugalski <tomasz@isc.org>

Tue, 29 May 2012 09:16:55 +0000 (11:16 +0200)

committer Tomek Mrugalski <tomasz@isc.org>

Tue, 29 May 2012 09:16:55 +0000 (11:16 +0200)
author Tomek Mrugalski <tomasz@isc.org>
Tue, 29 May 2012 09:16:55 +0000 (11:16 +0200)
committer Tomek Mrugalski <tomasz@isc.org>
Tue, 29 May 2012 09:16:55 +0000 (11:16 +0200)
diff --cc src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
Simple merge
author	Tomek Mrugalski <tomasz@isc.org>
	Tue, 29 May 2012 09:16:55 +0000 (11:16 +0200)
committer	Tomek Mrugalski <tomasz@isc.org>
	Tue, 29 May 2012 09:16:55 +0000 (11:16 +0200)