From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 6 Apr 2013 19:23:57 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.4.0a1~1017^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=710b5f0b2452accf3495556b8bdc614699e6f544;p=thirdparty%2FPython%2Fcpython.git

Merge
---

710b5f0b2452accf3495556b8bdc614699e6f544