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

Merge
---

ad2c43b6871882c3fc2239dfd899b86157f5b27c