From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 24 Aug 2012 17:47:02 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0rc1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb0ec7dc425bbcd6a3325b2012f6843320219d34;p=python

Merge
---

cb0ec7dc425bbcd6a3325b2012f6843320219d34