Merge 3.2

diff --cc Misc/NEWS
Simple merge

diff --cc Objects/classobject.c
index 0416a6a7330a695e602ff6a5badf4d0977ca7718,b7d35ef8852e39ce1f904b4ae7512c3b3f522223..c481dd3e9c63a7056e37c583eaf540949b1b513d
--- 1/Objects/classobject.c
--- 2/Objects/classobject.c
+++ b/Objects/classobject.c
@@@ -242,10 -241,12 +242,12 @@@ method_repr(PyMethodObject *a
      if (klass == NULL)
          klassname = NULL;
      else {
 -        klassname = PyObject_GetAttrString(klass, "__name__");
 +        klassname = _PyObject_GetAttrId(klass, &PyId___name__);
          if (klassname == NULL) {
-             if (!PyErr_ExceptionMatches(PyExc_AttributeError))
+             if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+                 Py_XDECREF(funcname);
                  return NULL;
+             }
              PyErr_Clear();
          }
          else if (!PyUnicode_Check(klassname)) {