Merge 3.2: issue #13140

author Florent Xicluna <florent.xicluna@gmail.com>

Fri, 4 Nov 2011 09:22:57 +0000 (10:22 +0100)

committer Florent Xicluna <florent.xicluna@gmail.com>

Fri, 4 Nov 2011 09:22:57 +0000 (10:22 +0100)
author Florent Xicluna <florent.xicluna@gmail.com>
Fri, 4 Nov 2011 09:22:57 +0000 (10:22 +0100)
committer Florent Xicluna <florent.xicluna@gmail.com>
Fri, 4 Nov 2011 09:22:57 +0000 (10:22 +0100)
diff --cc Lib/socketserver.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Florent Xicluna <florent.xicluna@gmail.com>
	Fri, 4 Nov 2011 09:22:57 +0000 (10:22 +0100)
committer	Florent Xicluna <florent.xicluna@gmail.com>
	Fri, 4 Nov 2011 09:22:57 +0000 (10:22 +0100)
		1	2
Lib/socketserver.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history