merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2011 20:27:58 +0000 (15:27 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2011 20:27:58 +0000 (15:27 -0500)

Trivial merge