merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sat, 1 Mar 2014 07:04:10 +0000 (02:04 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 1 Mar 2014 07:04:10 +0000 (02:04 -0500)

Trivial merge