From: Raymond Hettinger <python@rcn.com>
Date: Sat, 16 Apr 2011 00:43:57 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.2.1b1~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f05c1394fe3c27e0fe33db984cf2f8bd9a4a1d47;p=thirdparty%2FPython%2Fcpython.git

merge
---

f05c1394fe3c27e0fe33db984cf2f8bd9a4a1d47