From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Sat, 7 May 2011 15:08:04 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2371
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9514b877ba8e2cd6c0d287748c8dd43bb97cf00;p=python

merge heads
---

e9514b877ba8e2cd6c0d287748c8dd43bb97cf00