From: Barry Warsaw <barry@python.org>
Date: Tue, 31 Jul 2012 20:03:25 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0b2~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a5af1288deb62d975c044a45711cc179b5a2ad1;p=thirdparty%2FPython%2Fcpython.git

merge
---

9a5af1288deb62d975c044a45711cc179b5a2ad1