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

Merge
---

eeb905bd7bb5224601837b6232bc6607480ef8af