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

Merge
---

9e64c91c922564a0510ec667dd38c11a7c1bd748