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

Trivial merge