From: Brian Curtin <brian@python.org>
Date: Wed, 1 Feb 2012 21:22:50 +0000 (-0600)
Subject: merge.
X-Git-Tag: v2.7.3rc1~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c8807bd5e29139728ea1532d330a767f373bc00;p=thirdparty%2FPython%2Fcpython.git

merge.
---

3c8807bd5e29139728ea1532d330a767f373bc00