xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/os-support/linux/lnx_video.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 1834cfb4470341aace64a2fa47d04f85dbf98a47 (from 265a633cf1fcbf497d6916d9e22403dffdde2e07)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Tue Aug 21 10:44:37 2007 -0400

    Fix an error message to not point to @xfree86.org.

diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index b3494a7..ad2b66f 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -411,7 +411,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 # ifndef JENSEN_SUPPORT
 	  FatalError("Jensen is not supported any more\n"
 		     "If you are intereseted in fixing Jensen support\n"
-		     "please contact xfree86 at xfree86.org\n");
+		     "please contact xorg at lists.freedesktop.org\n");
 # else
 	  xf86Msg(X_INFO,"Machine type is Jensen\n");
 	  pVidMem->mapMem = mapVidMemJensen;