From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 4 May 2012 20:16:09 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a4~278
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=149e255e00c6c69f1f641eced2549fa323fa8cf5;p=thirdparty%2FPython%2Fcpython.git

Merge
---

149e255e00c6c69f1f641eced2549fa323fa8cf5