[xorg-x11-server: 3/3] Merge branch 'f14'

[Adam Jackson]

commit a60ac6d2700143c939d8ebbc4dde0b3e5fdcd78e
Merge: 66f6b1c c913f83
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Aug 16 11:38:34 2010 -0400

    Merge branch 'f14'
    
    Conflicts:
    	xorg-x11-server.spec
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

 xorg-x11-server.spec              |    6 +++-
 xserver-1.9-reset-root-null.patch |   59 +++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletions(-)
---