merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sun, 3 Jul 2011 18:32:17 +0000 (13:32 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 3 Jul 2011 18:32:17 +0000 (13:32 -0500)

Trivial merge