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

[petri.lehtinen]

http://hg.python.org/cpython/rev/2b7e58153d11
changeset:   79949:2b7e58153d11
parent:      79947:2159ff4595b7
parent:      79948:5843723bc747
user:        Petri Lehtinen <petri at digip.org>
date:        Fri Oct 26 22:40:56 2012 +0300
summary:
  Merge 3.3

files:
  .gitignore |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 Modules/Setup.local
 Modules/config.c
 Modules/ld_so_aix
+Modules/_freeze_importlib
 Modules/_testembed
 PCbuild/*.bsc
 PCbuild/*.dll

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