Merged revisions 72301 via svnmerge from

Merged revisions 72301 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72301 | r.david.murray | 2009-05-04 18:59:07 -0400 (Mon, 04 May 2009) | 13 lines

  Merged revisions 72299 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r72299 | r.david.murray | 2009-05-04 18:16:24 -0400 (Mon, 04 May 2009) | 7 lines

    Fix issue 5890: (property subclass shadows __doc__ string) by inserting
    the __doc__ into the subclass instance __dict__.  The fix refactors
    property_copy to call property_init in such a way that the __doc__
    logic is re-executed correctly when getter_doc is 1, thus simplifying
    property_copy.
  ........
................