From: Georg Brandl <georg@python.org>
Date: Mon, 20 Feb 2012 22:52:16 +0000 (+0100)
Subject: Dummy-merge with 3.1
X-Git-Tag: v3.2.3rc1~20^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2697cd1a3b08ae07c4002f9d71f89e8966705f5b;p=python

Dummy-merge with 3.1
---

2697cd1a3b08ae07c4002f9d71f89e8966705f5b