--- stary-py-2.5.1/Python/ceval.c	2007-04-16 06:19:52.000000000 +0000
+++ Python-2.5.1/Python/ceval.c	2008-08-14 00:07:58.000000000 +0000
@@ -3991,9 +3991,15 @@
 
 	x = PyObject_GetAttr(v, name);
 	if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
+                PyObject *fn;
+                if((fn = PyObject_GetAttrString(v, "__file__")) == NULL) {
+                   fn = PyString_FromString("?");
+                }
+
 		PyErr_Format(PyExc_ImportError,
-			     "cannot import name %.230s",
-			     PyString_AsString(name));
+			     "cannot import name %.230s (%s)",
+			     PyString_AsString(name),
+                             PyString_AsString(fn));
 	}
 	return x;
 }