merge 3.4

Doc/tools/sphinxext/c_annotations.py

@@ -81,7 +81,10 @@ class Annotations(dict):
                 continue
             if not par[0].has_key('names') or not par[0]['names']:
                 continue
-            entry = self.get(par[0]['names'][0])
+            name = par[0]['names'][0]
+            if name.startswith("c."):
+                name = name[2:]
+            entry = self.get(name)
             if not entry:
                 continue
             elif entry.result_type not in ("PyObject*", "PyVarObject*"):