From: Raymond Hettinger <python@rcn.com>
Date: Sat, 25 Jun 2011 09:50:00 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.2.1rc2~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91b79afa3a0d02ec77094c632424c7e9049959cb;p=thirdparty%2FPython%2Fcpython.git

merge
---

91b79afa3a0d02ec77094c632424c7e9049959cb