Merged revisions 73809 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r73809 | benjamin.peterson | 2009-07-03 08:30:25 -0500 (Fri, 03 Jul 2009) | 1 line

  remove duplicate declartions #6405
........

Include/descrobject.h

@@ -73,8 +73,6 @@ PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
 PyAPI_DATA(PyTypeObject) PyMethodDescr_Type;
 PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
 PyAPI_DATA(PyTypeObject) PyDictProxy_Type;
-PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type;
-PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
 
 PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
 PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);

Misc/NEWS

@@ -23,6 +23,8 @@ Core and Builtins
 C-API
 -----
 
+- Issue #6405: Remove duplicatet type declarations in descrobject.h.
+
 - The code flags for old __future__ features are now available again.
 
 Library