From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 30 Mar 2013 15:29:54 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.4.0a1~1067
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9498839a1a29205d65c798a3a6bca272430b83c1;p=thirdparty%2FPython%2Fcpython.git

Merge
---

9498839a1a29205d65c798a3a6bca272430b83c1