Dummy merge from 3.2, as that approach to resolving #6074 is not applicable to importlib

This commit is contained in:
Nick Coghlan 2012-10-19 22:58:06 +10:00
commit 90eb8ae6ce

Diff Content Not Available