Merge with 3.2.
authorGeorg Brandl <georg@python.org>
Sun, 4 Dec 2011 10:51:33 +0000 (11:51 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 4 Dec 2011 10:51:33 +0000 (11:51 +0100)

Trivial merge