The previous checkin contained an experiment of Greg Stein's that wasn't
meant for checkin, and which broke marshal.loads().
diff --git a/Python/marshal.c b/Python/marshal.c
index df7f51c..ddccc89 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -743,7 +743,7 @@
 	PyObject *v;
 	char *s;
 	int n;
-	if (!PyArg_Parse(args, "r#", &s, &n))
+	if (!PyArg_Parse(args, "s#", &s, &n))
 		return NULL;
 	rf.fp = NULL;
 	rf.str = args;