From: Raymond Hettinger <python@rcn.com>
Date: Wed, 19 Oct 2011 21:16:47 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~1124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=587e75c70baac7f0641d3bc93b45ea7af1c30736;p=thirdparty%2FPython%2Fcpython.git

merge
---

587e75c70baac7f0641d3bc93b45ea7af1c30736