From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Sun, 14 Apr 2013 09:10:14 +0000 (-0700)
Subject: Merge heads.
X-Git-Tag: v3.3.2~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c4874f7a24dbec473dbcfcf6863ea57ede7d233;p=python

Merge heads.
---

5c4874f7a24dbec473dbcfcf6863ea57ede7d233