From: Raymond Hettinger <python@rcn.com>
Date: Thu, 20 Oct 2011 16:43:12 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~1117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d11a64d54cdf51537a2c8936b6585f65b3007792;p=thirdparty%2FPython%2Fcpython.git

merge
---

d11a64d54cdf51537a2c8936b6585f65b3007792