From: Georg Brandl <georg@python.org>
Date: Wed, 30 May 2012 20:04:57 +0000 (+0200)
Subject: Merge heads.
X-Git-Tag: v3.3.0b1~341
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01d7058d6acaf30441bf211580ba9c8d03b3c3c5;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

01d7058d6acaf30441bf211580ba9c8d03b3c3c5