merge default

author Michael Foord <michael@python.org>

Mon, 14 Mar 2011 23:03:30 +0000 (19:03 -0400)

committer Michael Foord <michael@python.org>

Mon, 14 Mar 2011 23:03:30 +0000 (19:03 -0400)
author Michael Foord <michael@python.org>
Mon, 14 Mar 2011 23:03:30 +0000 (19:03 -0400)
committer Michael Foord <michael@python.org>
Mon, 14 Mar 2011 23:03:30 +0000 (19:03 -0400)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Michael Foord <michael@python.org>
	Mon, 14 Mar 2011 23:03:30 +0000 (19:03 -0400)
committer	Michael Foord <michael@python.org>
	Mon, 14 Mar 2011 23:03:30 +0000 (19:03 -0400)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history