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

merge heads
---

26ad995ceb07059947008f0a5bfda639a0c7e3ba