Issue #12102: Merge with 3.2.

author Ross Lagerwall <rosslagerwall@gmail.com>

Mon, 25 Jul 2011 05:14:15 +0000 (07:14 +0200)

committer Ross Lagerwall <rosslagerwall@gmail.com>

Mon, 25 Jul 2011 05:14:15 +0000 (07:14 +0200)
author Ross Lagerwall <rosslagerwall@gmail.com>
Mon, 25 Jul 2011 05:14:15 +0000 (07:14 +0200)
committer Ross Lagerwall <rosslagerwall@gmail.com>
Mon, 25 Jul 2011 05:14:15 +0000 (07:14 +0200)
diff --cc Doc/ACKS.txt
Simple merge
diff --cc Doc/library/mmap.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Ross Lagerwall <rosslagerwall@gmail.com>
	Mon, 25 Jul 2011 05:14:15 +0000 (07:14 +0200)
committer	Ross Lagerwall <rosslagerwall@gmail.com>
	Mon, 25 Jul 2011 05:14:15 +0000 (07:14 +0200)
		1	2
Doc/ACKS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/mmap.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history