#12051: merge with 3.2.

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

Tue, 10 May 2011 22:23:41 +0000 (01:23 +0300)

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

Tue, 10 May 2011 22:23:41 +0000 (01:23 +0300)
author Ezio Melotti <ezio.melotti@gmail.com>
Tue, 10 May 2011 22:23:41 +0000 (01:23 +0300)
committer Ezio Melotti <ezio.melotti@gmail.com>
Tue, 10 May 2011 22:23:41 +0000 (01:23 +0300)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_json.c
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 10 May 2011 22:23:41 +0000 (01:23 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 10 May 2011 22:23:41 +0000 (01:23 +0300)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_json.c	patch \|	diff1 \|	diff2 \|	blob \| history