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

[petri.lehtinen]

http://hg.python.org/cpython/rev/bf8a0cf32305
changeset:   73384:bf8a0cf32305
parent:      73382:3f22e4f4c761
parent:      73383:dc839da60f13
user:        Petri Lehtinen <petri at digip.org>
date:        Sat Nov 05 22:06:49 2011 +0200
summary:
  Merge 3.2

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


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

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