merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 1 Jan 2013 03:40:42 +0000 (21:40 -0600)
committerBenjamin Peterson <benjamin@python.org>
Tue, 1 Jan 2013 03:40:42 +0000 (21:40 -0600)

Trivial merge