From: Gregory P. Smith <greg@krypto.org>
Date: Sat, 29 Sep 2012 18:56:41 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~815^2~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ce589cf7b874f3d0323612e0c25f12cc6d844da;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

8ce589cf7b874f3d0323612e0c25f12cc6d844da