Merge #9298 fix.

author R David Murray <rdmurray@bitdance.com>

Wed, 16 Mar 2011 20:14:43 +0000 (16:14 -0400)

committer R David Murray <rdmurray@bitdance.com>

Wed, 16 Mar 2011 20:14:43 +0000 (16:14 -0400)
author R David Murray <rdmurray@bitdance.com>
Wed, 16 Mar 2011 20:14:43 +0000 (16:14 -0400)
committer R David Murray <rdmurray@bitdance.com>
Wed, 16 Mar 2011 20:14:43 +0000 (16:14 -0400)
diff --cc Lib/email/test/test_email.py
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Wed, 16 Mar 2011 20:14:43 +0000 (16:14 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Wed, 16 Mar 2011 20:14:43 +0000 (16:14 -0400)
		1	2
Lib/email/test/test_email.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history