merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 13 Mar 2012 21:46:35 +0000 (16:46 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 13 Mar 2012 21:46:35 +0000 (16:46 -0500)

Trivial merge