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

[ezio.melotti]

http://hg.python.org/cpython/rev/850a659d9e6f
changeset:   69375:850a659d9e6f
branch:      3.2
parent:      69371:503578ddf286
parent:      69374:1d6e28df2fb7
user:        Ezio Melotti
date:        Fri Apr 15 18:07:38 2011 +0300
summary:
  #11843: Merge with 3.1.

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