merge 3.3

author Benjamin Peterson <benjamin@python.org>

Tue, 9 Oct 2012 15:16:13 +0000 (11:16 -0400)

committer Benjamin Peterson <benjamin@python.org>

Tue, 9 Oct 2012 15:16:13 +0000 (11:16 -0400)
author Benjamin Peterson <benjamin@python.org>
Tue, 9 Oct 2012 15:16:13 +0000 (11:16 -0400)
committer Benjamin Peterson <benjamin@python.org>
Tue, 9 Oct 2012 15:16:13 +0000 (11:16 -0400)
diff --cc Lib/os.py
Simple merge
diff --cc Lib/pydoc.py
Simple merge
diff --cc Lib/test/test_sys.py
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Tue, 9 Oct 2012 15:16:13 +0000 (11:16 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Tue, 9 Oct 2012 15:16:13 +0000 (11:16 -0400)
		1	2
Lib/os.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/pydoc.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_sys.py	patch \|	diff1 \|	diff2 \|	blob \| history