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

Merge 3.3
---

bdc3eb76234f58d7ab9f215748cb73c4cb3c27e8