Merge branch 'master' into trac2507

author Mukund Sivaraman <muks@isc.org>

Fri, 21 Dec 2012 04:24:33 +0000 (09:54 +0530)

committer Mukund Sivaraman <muks@isc.org>

Fri, 21 Dec 2012 04:24:33 +0000 (09:54 +0530)
author Mukund Sivaraman <muks@isc.org>
Fri, 21 Dec 2012 04:24:33 +0000 (09:54 +0530)
committer Mukund Sivaraman <muks@isc.org>
Fri, 21 Dec 2012 04:24:33 +0000 (09:54 +0530)
diff --cc src/bin/dhcp6/tests/config_parser_unittest.cc
Simple merge
author	Mukund Sivaraman <muks@isc.org>
	Fri, 21 Dec 2012 04:24:33 +0000 (09:54 +0530)
committer	Mukund Sivaraman <muks@isc.org>
	Fri, 21 Dec 2012 04:24:33 +0000 (09:54 +0530)