Merged revisions 81744 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81744 | mark.dickinson | 2010-06-05 13:51:21 +0100 (Sat, 05 Jun 2010) | 1 line

  Fix comment typo.
........

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index f496804e4c32e7328abcbbabd399422be11624f0..4c972648aeafa1e21581c7dba74b5d454aa2d6df 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3860,7 +3860,7 @@ inherit_slots(PyTypeObject *type, PyTypeObject *base)
                             /* XXX This isn't right.  If the warning is turned
                                into an exception, we should be communicating
                                the error back to the caller, but figuring out
-                               how to clean-up in that case is tricky.  See
+                               how to clean up in that case is tricky.  See
                                issue 8627 for more. */
                             PyErr_Clear();
                     }