Merge from 3.2

author Nick Coghlan <ncoghlan@gmail.com>

Thu, 17 Mar 2011 01:48:30 +0000 (21:48 -0400)

committer Nick Coghlan <ncoghlan@gmail.com>

Thu, 17 Mar 2011 01:48:30 +0000 (21:48 -0400)
author Nick Coghlan <ncoghlan@gmail.com>
Thu, 17 Mar 2011 01:48:30 +0000 (21:48 -0400)
committer Nick Coghlan <ncoghlan@gmail.com>
Thu, 17 Mar 2011 01:48:30 +0000 (21:48 -0400)
diff --cc Lib/email/test/test_email.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Nick Coghlan <ncoghlan@gmail.com>
	Thu, 17 Mar 2011 01:48:30 +0000 (21:48 -0400)
committer	Nick Coghlan <ncoghlan@gmail.com>
	Thu, 17 Mar 2011 01:48:30 +0000 (21:48 -0400)
		1	2
Lib/email/test/test_email.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history