From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 25 Jun 2011 09:38:16 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2058
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=473bc274333c2d7cf476f55180a3afef19fe663b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

473bc274333c2d7cf476f55180a3afef19fe663b
diff --cc .hgignore
index 7bb2457d11b1,7136ed1a4b70..6a2615b94b2d
--- a/.hgignore
+++ b/.hgignore
@@@ -64,9 -62,9 +64,12 @@@ PCbuild/*.ex
  PCbuild/*.o
  PCbuild/*.ncb
  PCbuild/*.bsc
 +PCbuild/*.user
 +PCbuild/*.suo
  PCbuild/Win32-temp-*
 +PCbuild/x64-temp-*
  __pycache__
  Modules/_testembed
+ .coverage
+ coverage/
+ htmlcov/