From: Raymond Hettinger <python@rcn.com>
Date: Sun, 16 Oct 2011 07:00:51 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.3.0a1~1161
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8886fc831e16ab225f7e474751cc1a7b3cd01df;p=thirdparty%2FPython%2Fcpython.git

Merge
---

d8886fc831e16ab225f7e474751cc1a7b3cd01df