merge 3.1
authorBenjamin Peterson <benjamin@python.org>
Sun, 9 Dec 2012 15:14:42 +0000 (10:14 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 9 Dec 2012 15:14:42 +0000 (10:14 -0500)

Trivial merge