Merge branch 'master' into XACE-SELINUX

Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...

Xext/cup.c

@@ -123,16 +123,13 @@ static xColorItem citems[] = {
 void
 XcupExtensionInit (INITARGS)
 {
-    ExtensionEntry* extEntry;
-
-    if (!(extEntry = AddExtension (XCUPNAME,
-				   0,
-				   XcupNumberErrors,
-				   ProcDispatch,
-				   SProcDispatch,
-				   ResetProc,
-				   StandardMinorOpcode)))
-	return;
+    (void) AddExtension (XCUPNAME,
+			0,
+			XcupNumberErrors,
+			ProcDispatch,
+			SProcDispatch,
+			ResetProc,
+			StandardMinorOpcode);
 
     /* PC servers initialize the desktop colors (citems) here! */
 }