Merge from 3.4

author Senthil Kumaran <senthil@uthcode.com>

Wed, 17 Sep 2014 08:32:46 +0000 (16:32 +0800)

committer Senthil Kumaran <senthil@uthcode.com>

Wed, 17 Sep 2014 08:32:46 +0000 (16:32 +0800)
author Senthil Kumaran <senthil@uthcode.com>
Wed, 17 Sep 2014 08:32:46 +0000 (16:32 +0800)
committer Senthil Kumaran <senthil@uthcode.com>
Wed, 17 Sep 2014 08:32:46 +0000 (16:32 +0800)
diff --cc Lib/test/test_wsgiref.py
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Senthil Kumaran <senthil@uthcode.com>
	Wed, 17 Sep 2014 08:32:46 +0000 (16:32 +0800)
committer	Senthil Kumaran <senthil@uthcode.com>
	Wed, 17 Sep 2014 08:32:46 +0000 (16:32 +0800)
		1	2
Lib/test/test_wsgiref.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history