From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 14 Mar 2012 22:27:12 +0000 (+0100)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c466b4fdcdf59f8d98abcbf62dbbf4ab209d2db;p=python

merge 3.2
---

7c466b4fdcdf59f8d98abcbf62dbbf4ab209d2db