From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 14 Feb 2012 00:44:18 +0000 (-0800)
Subject: merge the import re (already in this branch).
X-Git-Tag: v3.3.0a1~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dba5317eb0904916ace6fc09d0f8520dbb078863;p=thirdparty%2FPython%2Fcpython.git

merge the import re (already in this branch).
---

dba5317eb0904916ace6fc09d0f8520dbb078863