Reverted incorrect merge (missing files)

svn up -r 21247
svn merge -r 21247:21246 . (<= revert incorrect: merge -r 21041:21243)
svn up

source/blender/python/intern/bpy_util.c

@@ -1,5 +1,5 @@
 /**
- * $Id$
+ * $Id: bpy_util.c 21247 2009-06-29 21:50:53Z jaguarandi $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -171,7 +171,7 @@ void PyObSpit(char *name, PyObject *var) {
 	else {
 		PyObject_Print(var, stderr, 0);
 		fprintf(stderr, " ref:%d ", var->ob_refcnt);
-		fprintf(stderr, " ptr:%p", (void *)var);
+		fprintf(stderr, " ptr:%ld", (long)var);
 		
 		fprintf(stderr, " type:");
 		if(Py_TYPE(var))