From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Sun, 14 Apr 2013 10:31:40 +0000 (-0700)
Subject: Merge heads.
X-Git-Tag: v3.3.2~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8157459d6b39bff7a8d6ffdfb66175d74dde1448;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

8157459d6b39bff7a8d6ffdfb66175d74dde1448