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

[brett.cannon]

http://hg.python.org/cpython/rev/d5d34899f7d5
changeset:   80040:d5d34899f7d5
parent:      79993:57a33af85407
parent:      80039:a2b7a3e1ce66
user:        Brett Cannon <brett at python.org>
date:        Sun Oct 28 11:47:54 2012 -0400
summary:
  Merge with 3.3

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


diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -47,7 +47,6 @@
 *.pyd
 *.cover
 *~
-Lib/_sysconfigdata.py
 Lib/lib2to3/*.pickle
 Lib/test/data/*
 Misc/*.wpu

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