Merge branch 'master' into trac2004

author Mukund Sivaraman <muks@isc.org>

Wed, 6 Jun 2012 05:14:34 +0000 (10:44 +0530)

committer Mukund Sivaraman <muks@isc.org>

Wed, 6 Jun 2012 05:14:34 +0000 (10:44 +0530)
author Mukund Sivaraman <muks@isc.org>
Wed, 6 Jun 2012 05:14:34 +0000 (10:44 +0530)
committer Mukund Sivaraman <muks@isc.org>
Wed, 6 Jun 2012 05:14:34 +0000 (10:44 +0530)
diff --cc src/lib/dns/python/tests/message_python_test.py
Simple merge
author	Mukund Sivaraman <muks@isc.org>
	Wed, 6 Jun 2012 05:14:34 +0000 (10:44 +0530)
committer	Mukund Sivaraman <muks@isc.org>
	Wed, 6 Jun 2012 05:14:34 +0000 (10:44 +0530)