Merge issue #21669 from 3.4

author Nick Coghlan <ncoghlan@gmail.com>

Mon, 16 Jun 2014 09:49:12 +0000 (19:49 +1000)

committer Nick Coghlan <ncoghlan@gmail.com>

Mon, 16 Jun 2014 09:49:12 +0000 (19:49 +1000)
author Nick Coghlan <ncoghlan@gmail.com>
Mon, 16 Jun 2014 09:49:12 +0000 (19:49 +1000)
committer Nick Coghlan <ncoghlan@gmail.com>
Mon, 16 Jun 2014 09:49:12 +0000 (19:49 +1000)
diff --cc Lib/test/test_grammar.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Nick Coghlan <ncoghlan@gmail.com>
	Mon, 16 Jun 2014 09:49:12 +0000 (19:49 +1000)
committer	Nick Coghlan <ncoghlan@gmail.com>
	Mon, 16 Jun 2014 09:49:12 +0000 (19:49 +1000)
		1	2
Lib/test/test_grammar.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history