merge 2.7.3 release branch

author Benjamin Peterson <benjamin@python.org>

Mon, 9 Apr 2012 23:05:58 +0000 (19:05 -0400)

committer Benjamin Peterson <benjamin@python.org>

Mon, 9 Apr 2012 23:05:58 +0000 (19:05 -0400)
author Benjamin Peterson <benjamin@python.org>
Mon, 9 Apr 2012 23:05:58 +0000 (19:05 -0400)
committer Benjamin Peterson <benjamin@python.org>
Mon, 9 Apr 2012 23:05:58 +0000 (19:05 -0400)
diff --cc .hgtags
Simple merge
diff --cc Include/patchlevel.h
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 9 Apr 2012 23:05:58 +0000 (19:05 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 9 Apr 2012 23:05:58 +0000 (19:05 -0400)
		1	2
.hgtags	patch \|	diff1 \|	diff2 \|	blob \| history
Include/patchlevel.h	patch \|	diff1 \|	diff2 \|	blob \| history