merge 3.3 (#20901)
authorBenjamin Peterson <benjamin@python.org>
Thu, 13 Mar 2014 02:52:19 +0000 (21:52 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 13 Mar 2014 02:52:19 +0000 (21:52 -0500)

Trivial merge