Issue #14696: Merge from 3.2

author Mark Dickinson <mdickinson@enthought.com>

Sun, 29 Apr 2012 21:20:01 +0000 (22:20 +0100)

committer Mark Dickinson <mdickinson@enthought.com>

Sun, 29 Apr 2012 21:20:01 +0000 (22:20 +0100)
author Mark Dickinson <mdickinson@enthought.com>
Sun, 29 Apr 2012 21:20:01 +0000 (22:20 +0100)
committer Mark Dickinson <mdickinson@enthought.com>
Sun, 29 Apr 2012 21:20:01 +0000 (22:20 +0100)
diff --cc Lib/test/test_parser.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/parsermodule.c
Simple merge
author	Mark Dickinson <mdickinson@enthought.com>
	Sun, 29 Apr 2012 21:20:01 +0000 (22:20 +0100)
committer	Mark Dickinson <mdickinson@enthought.com>
	Sun, 29 Apr 2012 21:20:01 +0000 (22:20 +0100)
		1	2
Lib/test/test_parser.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/parsermodule.c	patch \|	diff1 \|	diff2 \|	blob \| history