From: Georg Brandl <georg@python.org>
Date: Sat, 5 Mar 2011 14:15:55 +0000 (+0100)
Subject: Dummy-merge 3.1 branch into 3.2 branch.
X-Git-Tag: v3.2.1b1~347
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=766f1645ee3bb26123dd7177488051b4fa73cee8;p=python

Dummy-merge 3.1 branch into 3.2 branch.
---

766f1645ee3bb26123dd7177488051b4fa73cee8