From: Raymond Hettinger <python@rcn.com>
Date: Wed, 1 Feb 2012 17:08:08 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.3.0a1~269^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=590463efc4205337cd231f7bee03e5dabc22063f;p=thirdparty%2FPython%2Fcpython.git

merge
---

590463efc4205337cd231f7bee03e5dabc22063f