[Python-checkins] cpython (merge 3.2 -> default): #11843: Merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/bf1bf8fb5d55
changeset:   69376:bf1bf8fb5d55
parent:      69372:9801e1f78264
parent:      69375:850a659d9e6f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Apr 15 18:08:09 2011 +0300
summary:
  #11843: Merge with 3.2.

files:
  Doc/distutils/builtdist.rst |  2 --
  1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -88,8 +88,6 @@
 +-------------+------------------------------+---------+
 | ``sdux``    | HP-UX :program:`swinstall`   |         |
 +-------------+------------------------------+---------+
-| ``rpm``     | RPM                          | \(5)    |
-+-------------+------------------------------+---------+
 | ``wininst`` | self-extracting ZIP file for | \(4)    |
 |             | Windows                      |         |
 +-------------+------------------------------+---------+

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