Merged revisions 73880 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73880 | mark.dickinson | 2009-07-07 11:18:22 +0100 (Tue, 07 Jul 2009) | 1 line

  Typo in error message
........
diff --git a/Modules/_struct.c b/Modules/_struct.c
index 27d596c..3e0ab31 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -493,7 +493,7 @@
 		return -1;
 	if (x < 0 || x > USHRT_MAX){
 		PyErr_SetString(StructError,
-				"short format requires 0 <= number <= " STRINGIFY(USHRT_MAX));
+				"ushort format requires 0 <= number <= " STRINGIFY(USHRT_MAX));
 		return -1;
 	}
 	y = (unsigned short)x;