From: Raymond Hettinger <python@rcn.com>
Date: Sat, 25 Jun 2011 09:40:20 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.3.0a1~2056^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d359591b9263c24bddb49ce3968147388f60d82;p=thirdparty%2FPython%2Fcpython.git

merge
---

5d359591b9263c24bddb49ce3968147388f60d82