From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Sun, 21 Apr 2013 04:28:49 +0000 (-0700)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~864
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fe2184a0fa1e4ab2b93aa4097b72cad7bdf1549;p=python

Merge 3.3
---

4fe2184a0fa1e4ab2b93aa4097b72cad7bdf1549