From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 12 Apr 2013 13:23:24 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.3.2~132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ebdb61b67133cc6fae0540fb53185fdc957245c;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

6ebdb61b67133cc6fae0540fb53185fdc957245c