#17178: merge with 3.3.

author Ezio Melotti <ezio.melotti@gmail.com>

Fri, 15 Feb 2013 21:38:23 +0000 (23:38 +0200)

committer Ezio Melotti <ezio.melotti@gmail.com>

Fri, 15 Feb 2013 21:38:23 +0000 (23:38 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Fri, 15 Feb 2013 21:38:23 +0000 (23:38 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Fri, 15 Feb 2013 21:38:23 +0000 (23:38 +0200)
diff --cc Misc/ACKS
Simple merge
diff --cc Python/bltinmodule.c
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 15 Feb 2013 21:38:23 +0000 (23:38 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 15 Feb 2013 21:38:23 +0000 (23:38 +0200)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/bltinmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history