#17790: merge with 3.3.

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

Fri, 19 Apr 2013 02:59:17 +0000 (05:59 +0300)

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

Fri, 19 Apr 2013 02:59:17 +0000 (05:59 +0300)
author Ezio Melotti <ezio.melotti@gmail.com>
Fri, 19 Apr 2013 02:59:17 +0000 (05:59 +0300)
committer Ezio Melotti <ezio.melotti@gmail.com>
Fri, 19 Apr 2013 02:59:17 +0000 (05:59 +0300)
diff --cc Lib/test/test_set.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 19 Apr 2013 02:59:17 +0000 (05:59 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 19 Apr 2013 02:59:17 +0000 (05:59 +0300)
		1	2
Lib/test/test_set.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history