From: Brian Curtin <brian@python.org>
Date: Thu, 21 Jun 2012 22:11:45 +0000 (-0500)
Subject: Merge /features/pep397 changes
X-Git-Tag: v3.3.0b1~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01317d2ed5b06310ab9cefa7eed5912819ea89c9;p=thirdparty%2FPython%2Fcpython.git

Merge /features/pep397 changes
---

01317d2ed5b06310ab9cefa7eed5912819ea89c9