Recorded merge of revisions 68058 via svnmerge from

Recorded merge of revisions 68058 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r68058 | nick.coghlan | 2008-12-30 17:29:12 +1000 (Tue, 30 Dec 2008) | 9 lines

  Recorded merge of revisions 68051 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r68051 | nick.coghlan | 2008-12-30 11:18:48 +1000 (Tue, 30 Dec 2008) | 1 line

    Issue #4701: implicitly call PyType_Ready from PyObject_Hash
  ........
................