Dummy-merge with 3.1
authorGeorg Brandl <georg@python.org>
Mon, 20 Feb 2012 22:52:16 +0000 (23:52 +0100)
committerGeorg Brandl <georg@python.org>
Mon, 20 Feb 2012 22:52:16 +0000 (23:52 +0100)

Trivial merge