Merging appropriate 2.1.1 fixes back into the main trunk.
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index c760107..5fdfe55 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -227,7 +227,7 @@
     case smCyrillic:
         return "mac-cyrillic";
     default:
-        return "mac-roman"; /* better than nothing */
+        return "ascii"; /* better than nothing */
     }
 }