merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 6 Oct 2013 10:46:35 +0000 (12:46 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 6 Oct 2013 10:46:35 +0000 (12:46 +0200)

Trivial merge