From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 8 Jul 2012 12:00:06 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b2~278
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88bf5ca63b894e3b1d61520d9e1e07bc363e616f;p=python

Merge
---

88bf5ca63b894e3b1d61520d9e1e07bc363e616f