#17255: merge with 3.2.

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

Thu, 21 Feb 2013 21:17:08 +0000 (23:17 +0200)

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

Thu, 21 Feb 2013 21:17:08 +0000 (23:17 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Thu, 21 Feb 2013 21:17:08 +0000 (23:17 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Thu, 21 Feb 2013 21:17:08 +0000 (23:17 +0200)
diff --cc Lib/test/test_builtin.py
Simple merge
diff --cc Misc/ACKS

index e46be50ef583ceed59e0d23753d60afe3d0c69cf,74b191d3266a296cd138a353c9da999d2ac2c963..3fa29efa0e17da77096c95e96498a7f1c14ed290
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -421,9 -386,8 +421,10 @@@ Dinu Gherma
   Jonathan Giddy
   Johannes Gijsbers
   Michael Gilfix
+ +Yannick Gingras
   Matt Giuca
+ Wim Glenn
+ +Michael Goderbauer
   Christoph Gohlke
   Tim Golden
   Guilherme Gonçalves
author	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 21 Feb 2013 21:17:08 +0000 (23:17 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 21 Feb 2013 21:17:08 +0000 (23:17 +0200)
		1	2
Lib/test/test_builtin.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history