merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 20 Feb 2012 14:02:57 +0000 (09:02 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 20 Feb 2012 14:02:57 +0000 (09:02 -0500)

Trivial merge