Merge branch 'mesa_7_5_branch'

Conflicts:
	src/mesa/main/dlist.c
	src/mesa/vbo/vbo_save_api.c

1 files changed, 2 insertions, 1 deletions

diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c
index b3290e90d51..b1a63d3d50c 100644
--- a/progs/xdemos/glxheads.c
+++ b/progs/xdemos/glxheads.c
@@ -267,7 +267,8 @@ main(int argc, char *argv[])
       printf("  glxheads xdisplayname ...\n");
       printf("Example:\n");
       printf("  glxheads :0 mars:0 venus:1\n");
-      h = AddHead(":0");
+
+      h = AddHead(XDisplayName(NULL));
       if (h)
          PrintInfo(h);
    }