Merge #17987: properly document support.captured_xxx.

author R David Murray <rdmurray@bitdance.com>

Thu, 11 Jul 2013 16:29:31 +0000 (12:29 -0400)

committer R David Murray <rdmurray@bitdance.com>

Thu, 11 Jul 2013 16:29:31 +0000 (12:29 -0400)
author R David Murray <rdmurray@bitdance.com>
Thu, 11 Jul 2013 16:29:31 +0000 (12:29 -0400)
committer R David Murray <rdmurray@bitdance.com>
Thu, 11 Jul 2013 16:29:31 +0000 (12:29 -0400)
diff --cc Lib/test/support.py
Simple merge
diff --cc Misc/ACKS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Thu, 11 Jul 2013 16:29:31 +0000 (12:29 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Thu, 11 Jul 2013 16:29:31 +0000 (12:29 -0400)
		1	2
Lib/test/support.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history