* Tue Aug 25 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-41.20090825

- Today's git snapshot.

.cvsignore

@@ -1 +1 @@
-xorg-server-20090820.tar.xz
+xorg-server-20090825.tar.xz

commitid

@@ -1 +1 @@
-9d8fc33cae2fee7777edd20658dbf6a3ffb3d557
+0f9ffc887ca1471e98df746253d9300e03e46a15

sources

@@ -1 +1 @@
-ea807505ea5c7e6c2d1a7f1cadce4f6f  xorg-server-20090820.tar.xz
+2155224c1468113477aed53561b09063  xorg-server-20090825.tar.xz

xorg-x11-server.spec

@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090820
+%define gitdate 20090825
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   40.%{gitdate}%{?dist}
+Release:   41.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -507,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Aug 25 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-41.20090825
+- Today's git snapshot.
+
 * Mon Aug 24 2009 Ben Skeggs <bskeggs@redhat.com> 1.6.99-40.20090820
 - xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS
   should work on them now, there's accel issues on some of them but we can

xserver-1.6.99-vga-arb.patch

@@ -39,7 +39,7 @@ index 1e3438e..a1219d6 100644
 +	AC_CHECK_FUNCS([pci_device_vgaarb_init])
  	LIBS=$SAVE_LIBS
  	CFLAGS=$SAVE_CFLAGS
- 	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS"
+ 	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
 diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
 index f3e201b..ad27210 100644
 --- a/hw/xfree86/common/Makefile.am