From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 25 Jun 2011 10:02:53 +0000 (+0200)
Subject: merge
X-Git-Tag: v2.7.3rc1~676
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b0c22ced3e756e56873a8331ff39eedef788992;p=thirdparty%2FPython%2Fcpython.git

merge
---

5b0c22ced3e756e56873a8331ff39eedef788992