#17255: merge with 3.3.

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

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

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

Thu, 21 Feb 2013 21:17:34 +0000 (23:17 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Thu, 21 Feb 2013 21:17:34 +0000 (23:17 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Thu, 21 Feb 2013 21:17:34 +0000 (23:17 +0200)
diff --cc Lib/test/test_builtin.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 21 Feb 2013 21:17:34 +0000 (23:17 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 21 Feb 2013 21:17:34 +0000 (23:17 +0200)
		1	2
Lib/test/test_builtin.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history