From: Raymond Hettinger <python@rcn.com>
Date: Sat, 25 Jun 2011 09:48:54 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.3.0a1~2057
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddc56e09b930ff4acbc18a4f5c19c922749df193;p=thirdparty%2FPython%2Fcpython.git

merge
---

ddc56e09b930ff4acbc18a4f5c19c922749df193