From: Éric Araujo <merwok@netwok.org>
Date: Sat, 3 Nov 2012 21:07:40 +0000 (-0400)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~2095
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c997fa8bf5970eee0762664f598d13d5c5a48a8;p=thirdparty%2FPython%2Fcpython.git

Merge 3.3
---

8c997fa8bf5970eee0762664f598d13d5c5a48a8