From: Gregory P. Smith <greg@krypto.org>
Date: Mon, 25 Jun 2012 08:15:53 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0b1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68d34f48bf9bb9a9b888b5243cc00cc25fe0b97c;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

68d34f48bf9bb9a9b888b5243cc00cc25fe0b97c