From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 24 Aug 2012 17:51:09 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0rc1~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d649ef9513613b6b9fc413ce64b24e80e7e33c3;p=thirdparty%2FPython%2Fcpython.git

Merge
---

8d649ef9513613b6b9fc413ce64b24e80e7e33c3