From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Mon, 14 Mar 2011 08:41:58 +0000 (+0200)
Subject: Merge from 3.1
X-Git-Tag: v3.2.1b1~312
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13312638b37dfdc725260d49df6402bfe70c9fc7;p=python

Merge from 3.1
---

13312638b37dfdc725260d49df6402bfe70c9fc7