Merge: use OSError instead of os.error in the docs.

author Andrew Svetlov <andrew.svetlov@gmail.com>

Sat, 15 Dec 2012 20:59:55 +0000 (22:59 +0200)

committer Andrew Svetlov <andrew.svetlov@gmail.com>

Sat, 15 Dec 2012 20:59:55 +0000 (22:59 +0200)
author Andrew Svetlov <andrew.svetlov@gmail.com>
Sat, 15 Dec 2012 20:59:55 +0000 (22:59 +0200)
committer Andrew Svetlov <andrew.svetlov@gmail.com>
Sat, 15 Dec 2012 20:59:55 +0000 (22:59 +0200)
diff --cc Doc/library/os.path.rst
Simple merge
diff --cc Doc/library/shutil.rst
Simple merge
author	Andrew Svetlov <andrew.svetlov@gmail.com>
	Sat, 15 Dec 2012 20:59:55 +0000 (22:59 +0200)
committer	Andrew Svetlov <andrew.svetlov@gmail.com>
	Sat, 15 Dec 2012 20:59:55 +0000 (22:59 +0200)
		1	2
Doc/library/os.path.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/shutil.rst	patch \|	diff1 \|	diff2 \|	blob \| history