From: Charles-François Natali <cf.natali@gmail.com>
Date: Mon, 16 Dec 2013 12:49:38 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0b2~205^2~1^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef3e4c19d723bfda070152b4a236182c739ee452;p=python

Merge.
---

ef3e4c19d723bfda070152b4a236182c739ee452