Index: Python/import.c
===================================================================
--- Python/import.c	(revisi¢n: 54167)
+++ Python/import.c	(copia de trabajo)
@@ -1172,6 +1172,11 @@
 		Py_DECREF(meta_path);
 	}

+	if (fullname != NULL && is_builtin(fullname)) {
+		strcpy(buf, fullname);
+		return &fd_builtin;
+	}
+
 	if (path != NULL && PyString_Check(path)) {
 		/* The only type of submodule allowed inside a "frozen"
 		   package are other frozen modules or packages. */
@@ -1192,11 +1197,8 @@
 			     "No frozen submodule named %.200s", name);
 		return NULL;
 	}
+
 	if (path == NULL) {
-		if (is_builtin(name)) {
-			strcpy(buf, name);
-			return &fd_builtin;
-		}
 		if ((find_frozen(name)) != NULL) {
 			strcpy(buf, name);
 			return &fd_frozen;
@@ -2366,7 +2368,7 @@
 			if (path == NULL) {
 				PyErr_Clear();
 				Py_INCREF(Py_None);
-				return Py_None;
+				path = Py_None;
 			}
 		}

Index: PCbuild/pythoncore.vcproj
===================================================================
--- PCbuild/pythoncore.vcproj	(revisi¢n: 54167)
+++ PCbuild/pythoncore.vcproj	(copia de trabajo)
@@ -791,6 +791,9 @@
 			RelativePath="..\Modules\xxsubtype.c">
 		</File>
 		<File
+			RelativePath="..\Modules\xxsubmoduletest.c">
+		</File>
+		<File
 			RelativePath="..\Modules\yuvconvert.c">
 		</File>
 		<File
Index: PC/config.c
===================================================================
--- PC/config.c	(revisi¢n: 54167)
+++ PC/config.c	(copia de trabajo)
@@ -69,6 +69,8 @@
 extern void init_ast(void);
 extern void init_types(void);

+extern void initxxsubmoduletest(void);
+
 /* tools/freeze/makeconfig.py marker for additional "extern" */
 /* -- ADDMODULE MARKER 1 -- */

@@ -162,9 +164,12 @@
         {"__builtin__", NULL},
         {"sys", NULL},
 	{"exceptions", NULL},
-
+
         {"_types", init_types},

+	/** This is for a regression test */
+        {"xxsubtype.xxsubmoduletest", initxxsubmoduletest},
+
         /* Sentinel */
         {0, 0}
 };
Index: Modules/Setup.dist
===================================================================
--- Modules/Setup.dist	(revisi¢n: 54167)
+++ Modules/Setup.dist	(copia de trabajo)
@@ -485,3 +485,6 @@

 # Another example -- the 'xxsubtype' module shows C-level subtyping in action
 xxsubtype xxsubtype.c
+
+# Module used in a regression test
+xxsubtype.xxsubmoduletest xxsubmoduletest.c