Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
diff --git a/Mac/Modules/macconfig.c b/Mac/Modules/macconfig.c
index 5c545b4..f5f78bf 100644
--- a/Mac/Modules/macconfig.c
+++ b/Mac/Modules/macconfig.c
@@ -158,6 +158,9 @@
 #ifdef WITH_THREAD
 extern void initthread();
 #endif
+#ifdef WITH_HOTSHOT
+extern void init_hotshot();
+#endif
 #ifdef USE_PYEXPAT
 extern void initpyexpat();
 #endif
@@ -288,6 +291,9 @@
 #ifdef WITH_THREAD
 	{"thread",	initthread},
 #endif
+#ifdef WITH_HOTSHOT
+	{"_hotshot",	init_hotshot},
+#endif
 #ifdef USE_PYEXPAT
 	{"pyexpat", initpyexpat},
 #endif