merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 6 Feb 2012 16:29:05 +0000 (11:29 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 6 Feb 2012 16:29:05 +0000 (11:29 -0500)

Trivial merge