#12759: merge with 3.2.

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

Sat, 3 Nov 2012 18:33:38 +0000 (20:33 +0200)

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

Sat, 3 Nov 2012 18:33:38 +0000 (20:33 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Sat, 3 Nov 2012 18:33:38 +0000 (20:33 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Sat, 3 Nov 2012 18:33:38 +0000 (20:33 +0200)
diff --cc Lib/sre_parse.py
Simple merge
diff --cc Lib/test/test_re.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Sat, 3 Nov 2012 18:33:38 +0000 (20:33 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Sat, 3 Nov 2012 18:33:38 +0000 (20:33 +0200)
		1	2
Lib/sre_parse.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_re.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history