[xorg-x11-server/f17: 9/9] Merge branch 'master' into f17

[Peter Hutterer]

commit 5e4e2bcd69edd5e98adb052bf95b9afe3b64c9d5
Merge: 0134dbf c2c1041
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jun 4 17:37:57 2012 +1000

    Merge branch 'master' into f17
    
    Conflicts:
    	xorg-x11-server.spec

 .gitignore                                        |    2 +
 sources                                           |    2 +-
 xorg-x11-server.spec                              |   46 +++-
 xserver-1.10.99.1-test.patch                      |   37 ---
 xserver-1.12-Xext-fix-selinux-build-failure.patch |   20 +-
 xserver-1.12-modesetting-fallback.patch           |   32 +++
 xserver-1.4.99-ssh-isnt-local.patch               |   32 ++--
 xserver-1.6.0-displayfd.patch                     |  252 ++++++++++++---------
 xserver-1.6.0-less-acpi-brokenness.patch          |   12 +-
 xserver-1.6.99-right-of.patch                     |  144 ++++++------
 xserver-fix-pci-slot-claims.patch                 |  143 ++++++++++++
 11 files changed, 455 insertions(+), 267 deletions(-)
---