merge 3.3

author Benjamin Peterson <benjamin@python.org>

Fri, 18 Jan 2013 05:10:37 +0000 (00:10 -0500)

committer Benjamin Peterson <benjamin@python.org>

Fri, 18 Jan 2013 05:10:37 +0000 (00:10 -0500)
author Benjamin Peterson <benjamin@python.org>
Fri, 18 Jan 2013 05:10:37 +0000 (00:10 -0500)
committer Benjamin Peterson <benjamin@python.org>
Fri, 18 Jan 2013 05:10:37 +0000 (00:10 -0500)
diff --cc Lib/test/test_signal.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/signalmodule.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Fri, 18 Jan 2013 05:10:37 +0000 (00:10 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Fri, 18 Jan 2013 05:10:37 +0000 (00:10 -0500)
		1	2
Lib/test/test_signal.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/signalmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history