From: Raymond Hettinger <python@rcn.com>
Date: Tue, 19 Apr 2011 18:15:11 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~2554
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0193f35d700dbe58ac88b1895678864246b51e2e;p=thirdparty%2FPython%2Fcpython.git

merge
---

0193f35d700dbe58ac88b1895678864246b51e2e