From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Tue, 25 Sep 2012 19:34:54 +0000 (-0700)
Subject: merge 3.3
X-Git-Tag: v3.3.1rc1~818^2^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8286951f57ad596f248bc9ec765884e1536a87ee;p=python

merge 3.3
---

8286951f57ad596f248bc9ec765884e1536a87ee