From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 23 Jun 2012 22:20:11 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b1~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86da524ae0ba43639436dff353ec2e5a93909a66;p=thirdparty%2FPython%2Fcpython.git

Merge
---

86da524ae0ba43639436dff353ec2e5a93909a66