Merge #10999 fix.

author R David Murray <rdmurray@bitdance.com>

Thu, 10 Mar 2011 22:22:33 +0000 (17:22 -0500)

committer R David Murray <rdmurray@bitdance.com>

Thu, 10 Mar 2011 22:22:33 +0000 (17:22 -0500)
author R David Murray <rdmurray@bitdance.com>
Thu, 10 Mar 2011 22:22:33 +0000 (17:22 -0500)
committer R David Murray <rdmurray@bitdance.com>
Thu, 10 Mar 2011 22:22:33 +0000 (17:22 -0500)
diff --cc Doc/library/os.rst
Simple merge
diff --cc Doc/library/stat.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Thu, 10 Mar 2011 22:22:33 +0000 (17:22 -0500)
committer	R David Murray <rdmurray@bitdance.com>
	Thu, 10 Mar 2011 22:22:33 +0000 (17:22 -0500)
		1	2
Doc/library/os.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/stat.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history