merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Mon, 4 Jul 2011 03:19:29 +0000 (22:19 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 4 Jul 2011 03:19:29 +0000 (22:19 -0500)

Trivial merge