[xorg-x11-server/f16: 3/3] Merge branch 'master' into f16

[Adam Jackson]

commit bd87fc348a721b06302e4edb907231a29544d3ce
Merge: e561d68 82739d8
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Aug 18 12:33:10 2011 -0400

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

 .gitignore                                         |    1 +
 commitid                                           |    2 +-
 sources                                            |    1 +
 xorg-x11-server.spec                               |   31 +-
 xserver-1.10-pointer-barriers.patch                |  645 --------------------
 ...onfig-add-udev-systemd-multi-seat-support.patch |   67 +-
 xserver-1.5.0-bg-none-root.patch                   |  155 -----
 7 files changed, 48 insertions(+), 854 deletions(-)
---