#10713: merge with 3.2.

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

Wed, 29 Feb 2012 09:49:45 +0000 (11:49 +0200)

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

Wed, 29 Feb 2012 09:49:45 +0000 (11:49 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Wed, 29 Feb 2012 09:49:45 +0000 (11:49 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Wed, 29 Feb 2012 09:49:45 +0000 (11:49 +0200)
diff --cc Doc/library/re.rst
Simple merge
diff --cc Lib/test/test_re.py
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Wed, 29 Feb 2012 09:49:45 +0000 (11:49 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Wed, 29 Feb 2012 09:49:45 +0000 (11:49 +0200)
		1	2
Doc/library/re.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_re.py	patch \|	diff1 \|	diff2 \|	blob \| history