Merged revisions 77603 via svnmerge from

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

........
  r77603 | benjamin.peterson | 2010-01-19 00:07:56 +0100 (Di, 19 Jan 2010) | 8 lines

  data descriptors do not override the class dictionary if __get__ is not defined

  Adjust documentation and add a test to verify this behavior.

  See http://mail.python.org/pipermail/python-dev/2010-January/095637.html for
  discussion.
........