From: Raymond Hettinger <python@rcn.com>
Date: Tue, 19 Apr 2011 18:12:47 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~2554^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=111474452db9ae6fec3373c646ebab01726e2b50;p=thirdparty%2FPython%2Fcpython.git

merge
---

111474452db9ae6fec3373c646ebab01726e2b50