merge from 3.2 - Fix closes Issue11439 Remove the SVN keywords from the code as it...

diff --cc Lib/curses/__init__.py
index 5cd4edac369b514348cad6919df73e28d6e84b37,303ea3e791080df3363b112e1322dc86930eb5b8..61ce443a68592e4020dc26e2b175c0009862ac48
--- 1/Lib/curses/__init__.py
--- 2/Lib/curses/__init__.py
+++ b/Lib/curses/__init__.py
@@@ -10,9 -10,8 +10,7 @@@ the package, and perhaps a particular m
  
  """
  
- __revision__ = "$Id$"
- 
  from _curses import *
 -from curses.wrapper import wrapper
  import os as _os
  import sys as _sys
  

diff --cc Lib/distutils/__init__.py
Simple merge

diff --cc Lib/distutils/command/bdist_wininst.py
Simple merge

diff --cc Lib/distutils/command/build_scripts.py
Simple merge

diff --cc Lib/tarfile.py
index 8129a80330bbc011efbc4ca4f02ef10af617d7d4,63c7554af20d0d3132cf6dae29ddc87a33f77c9c..bd92dedd677ccf3a3e9c5d79193d6814470ab618
--- 1/Lib/tarfile.py
--- 2/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@@ -29,10 -29,12 +29,10 @@@
  """Read from and write to tar format archives.
  """
  
 -__version__ = "$Revision$"
 -
  version     = "0.9.0"
  __author__  = "Lars Gust\u00e4bel (lars@gustaebel.de)"
- __date__    = "$Date$"
- __cvsid__   = "$Id$"
+ __date__    = "$Date: 2011-02-25 17:42:01 +0200 (Fri, 25 Feb 2011) $"
+ __cvsid__   = "$Id: tarfile.py 88586 2011-02-25 15:42:01Z marc-andre.lemburg $"
  __credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend."
  
  #---------

diff --cc Lib/textwrap.py
index f014cb0cf3d30b2b6e196afbf45aee33767e223e,dfb400548bd4d77723e25bad9eb73a0f597d46b3..0aeba3f3246b1f4f68298207a281a9aa3da4741a
--- 1/Lib/textwrap.py
--- 2/Lib/textwrap.py
+++ b/Lib/textwrap.py
@@@ -5,9 -5,7 +5,7 @@@
  # Copyright (C) 2002, 2003 Python Software Foundation.
  # Written by Greg Ward <gward@python.net>
  
- __revision__ = "$Id$"
- 
 -import string, re
 +import re
  
  __all__ = ['TextWrapper', 'wrap', 'fill', 'dedent']