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

Trivial merge