From: Brian Curtin <brian@python.org>
Date: Wed, 1 Feb 2012 21:20:03 +0000 (-0600)
Subject: merge updates
X-Git-Tag: v3.3.0a1~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97e200864575d86516c4dde3ecf6eedf3d534930;p=thirdparty%2FPython%2Fcpython.git

merge updates
---

97e200864575d86516c4dde3ecf6eedf3d534930