merge with 2.6

author Georg Brandl <georg@python.org>

Tue, 21 Feb 2012 21:38:31 +0000 (22:38 +0100)

committer Georg Brandl <georg@python.org>

Tue, 21 Feb 2012 21:38:31 +0000 (22:38 +0100)
author Georg Brandl <georg@python.org>
Tue, 21 Feb 2012 21:38:31 +0000 (22:38 +0100)
committer Georg Brandl <georg@python.org>
Tue, 21 Feb 2012 21:38:31 +0000 (22:38 +0100)
diff --cc Doc/using/cmdline.rst
Simple merge
diff --cc Misc/python.man
Simple merge
diff --cc Modules/main.c
Simple merge
author	Georg Brandl <georg@python.org>
	Tue, 21 Feb 2012 21:38:31 +0000 (22:38 +0100)
committer	Georg Brandl <georg@python.org>
	Tue, 21 Feb 2012 21:38:31 +0000 (22:38 +0100)
		1	2
Doc/using/cmdline.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/python.man	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/main.c	patch \|	diff1 \|	diff2 \|	blob \| history