Rolled back revisions 85003 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
diff --git a/Python/ceval.c b/Python/ceval.c
index 921cb48..673eac2 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3059,7 +3059,7 @@
                     defcount ? "at most" : "exactly",
                     co->co_argcount,
                     co->co_argcount == 1 ? "" : "s",
-                    argcount);
+                    argcount + kwcount);
                 goto fail;
             }
             n = co->co_argcount;