From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Sun, 14 Apr 2013 09:11:16 +0000 (-0700)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~941
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d9e14593ed45921e7a34e715ac17debdac3fd5a;p=python

Merge 3.3
---

6d9e14593ed45921e7a34e715ac17debdac3fd5a