Merge 3.2

author Florent Xicluna <florent.xicluna@gmail.com>

Fri, 28 Oct 2011 09:23:25 +0000 (11:23 +0200)

committer Florent Xicluna <florent.xicluna@gmail.com>

Fri, 28 Oct 2011 09:23:25 +0000 (11:23 +0200)
author Florent Xicluna <florent.xicluna@gmail.com>
Fri, 28 Oct 2011 09:23:25 +0000 (11:23 +0200)
committer Florent Xicluna <florent.xicluna@gmail.com>
Fri, 28 Oct 2011 09:23:25 +0000 (11:23 +0200)
diff --cc Doc/library/argparse.rst
Simple merge
diff --cc Doc/library/stdtypes.rst
Simple merge
author	Florent Xicluna <florent.xicluna@gmail.com>
	Fri, 28 Oct 2011 09:23:25 +0000 (11:23 +0200)
committer	Florent Xicluna <florent.xicluna@gmail.com>
	Fri, 28 Oct 2011 09:23:25 +0000 (11:23 +0200)
		1	2
Doc/library/argparse.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/stdtypes.rst	patch \|	diff1 \|	diff2 \|	blob \| history