From: Raymond Hettinger <python@rcn.com>
Date: Mon, 2 May 2011 18:03:37 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~2426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=334fdeed2ba9f66a1bee9d37e2d5698d8e9f39fc;p=thirdparty%2FPython%2Fcpython.git

merge
---

334fdeed2ba9f66a1bee9d37e2d5698d8e9f39fc