merge 3.2

diff --cc Objects/funcobject.c
index 5db86a6721b38567baf3facbcc7ce3fac0005389,2292a9ec98477840604330fc93e7bca5785396f3..6cbf297c58672ec1a5f96c6143f07e3984e89985
--- 1/Objects/funcobject.c
--- 2/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@@ -965,10 -889,7 +965,8 @@@ sm_traverse(staticmethod *sm, visitpro
  static int
  sm_clear(staticmethod *sm)
  {
-     Py_XDECREF(sm->sm_callable);
-     sm->sm_callable = NULL;
+     Py_CLEAR(sm->sm_callable);
 +    Py_CLEAR(sm->sm_dict);
- 
      return 0;
  }