From: Raymond Hettinger <python@rcn.com>
Date: Wed, 16 Mar 2011 01:21:00 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.3.0a1~2894
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7156af5a92268183922ea133b51f46f0178b713;p=thirdparty%2FPython%2Fcpython.git

Merge
---

f7156af5a92268183922ea133b51f46f0178b713