[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (sort of)

[benjamin.peterson]

http://hg.python.org/cpython/rev/e82acc646d3e
changeset:   80413:e82acc646d3e
parent:      80410:9a984c051cde
parent:      80412:59ea4a473e2a
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Nov 12 17:04:28 2012 -0500
summary:
  merge 3.3 (sort of)

files:
  Python/importlib.h |  3086 ++++++++++++++++----------------
  1 files changed, 1543 insertions(+), 1543 deletions(-)


diff --git a/Python/importlib.h b/Python/importlib.h
--- a/Python/importlib.h
+++ b/Python/importlib.h
[stripped]

-- 
Repository URL: http://hg.python.org/cpython