#14840: merge with 3.2.

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

Sun, 17 Jun 2012 12:12:42 +0000 (14:12 +0200)

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

Sun, 17 Jun 2012 12:12:42 +0000 (14:12 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Sun, 17 Jun 2012 12:12:42 +0000 (14:12 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Sun, 17 Jun 2012 12:12:42 +0000 (14:12 +0200)
diff --cc Doc/tutorial/datastructures.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Sun, 17 Jun 2012 12:12:42 +0000 (14:12 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Sun, 17 Jun 2012 12:12:42 +0000 (14:12 +0200)
		1	2
Doc/tutorial/datastructures.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history