merge #11700: proxy object close methods can now be called multiple times

author R David Murray <rdmurray@bitdance.com>

Sat, 18 Jun 2011 02:25:14 +0000 (22:25 -0400)

committer R David Murray <rdmurray@bitdance.com>

Sat, 18 Jun 2011 02:25:14 +0000 (22:25 -0400)
author R David Murray <rdmurray@bitdance.com>
Sat, 18 Jun 2011 02:25:14 +0000 (22:25 -0400)
committer R David Murray <rdmurray@bitdance.com>
Sat, 18 Jun 2011 02:25:14 +0000 (22:25 -0400)
diff --cc Lib/test/test_mailbox.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Sat, 18 Jun 2011 02:25:14 +0000 (22:25 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Sat, 18 Jun 2011 02:25:14 +0000 (22:25 -0400)
		1	2
Lib/test/test_mailbox.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history