From: Georg Brandl <georg@python.org>
Date: Tue, 10 Apr 2012 17:30:22 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.2.3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81c393b3ded977375d35297b3d47b47014b2391a;p=python

Merge.
---

81c393b3ded977375d35297b3d47b47014b2391a