merge #11584: make decode_header handle Header objects correctly

author R David Murray <rdmurray@bitdance.com>

Sat, 18 Jun 2011 16:32:27 +0000 (12:32 -0400)

committer R David Murray <rdmurray@bitdance.com>

Sat, 18 Jun 2011 16:32:27 +0000 (12:32 -0400)
author R David Murray <rdmurray@bitdance.com>
Sat, 18 Jun 2011 16:32:27 +0000 (12:32 -0400)
committer R David Murray <rdmurray@bitdance.com>
Sat, 18 Jun 2011 16:32:27 +0000 (12:32 -0400)
diff --cc Lib/test/test_email/test_email.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Sat, 18 Jun 2011 16:32:27 +0000 (12:32 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Sat, 18 Jun 2011 16:32:27 +0000 (12:32 -0400)
		1	2
Lib/test/test_email/test_email.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history