From: Raymond Hettinger <python@rcn.com>
Date: Sun, 30 Oct 2011 22:07:01 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.3.0a1~1017
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d12faa5b873bc85778b5a68b340eed659fa3519;p=thirdparty%2FPython%2Fcpython.git

Merge
---

5d12faa5b873bc85778b5a68b340eed659fa3519