#17178: merge with 3.2.

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

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

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

Fri, 15 Feb 2013 21:38:05 +0000 (23:38 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Fri, 15 Feb 2013 21:38:05 +0000 (23:38 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Fri, 15 Feb 2013 21:38:05 +0000 (23:38 +0200)
diff --cc Misc/ACKS

index cddf1610b5b035850e8a54490b8856442d603884,9ccc8e16c430d5356328415b88665d1d5b539e7e..e46be50ef583ceed59e0d23753d60afe3d0c69cf
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -39,8 -36,8 +39,9 @@@ Pehr Anderso
   Erik Andersén
   Oliver Andrich
   Ross Andrus
+ +Juancarlo Añez
   Jérémy Anger
+ Ankur Ankan
   Jon Anglin
   Heidi Annexstad
   Éric Araujo
diff --cc Python/bltinmodule.c
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 15 Feb 2013 21:38:05 +0000 (23:38 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 15 Feb 2013 21:38:05 +0000 (23:38 +0200)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/bltinmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history