From: Raymond Hettinger <python@rcn.com>
Date: Thu, 26 Jan 2012 08:15:07 +0000 (-0800)
Subject: Merge
X-Git-Tag: v3.3.0a1~299^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fd3f0c850543fc72d30c2e38c25419b05d97f4c;p=thirdparty%2FPython%2Fcpython.git

Merge
---

4fd3f0c850543fc72d30c2e38c25419b05d97f4c