From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 14 Aug 2012 15:30:12 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.0rc1~113^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ef977484d2b5aec52a99f26c803a1b9b28bcffd;p=python

merge 3.2
---

6ef977484d2b5aec52a99f26c803a1b9b28bcffd