merge 3.3 (#19114)
authorBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 15:13:50 +0000 (11:13 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 15:13:50 +0000 (11:13 -0400)

Trivial merge