From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Tue, 13 Dec 2011 18:22:42 +0000 (-0500)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~619
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a23d65ccfe3b8f618bf3dde4d0d27895e764367e;p=python

Merge 3.2
---

a23d65ccfe3b8f618bf3dde4d0d27895e764367e