[xorg-x11-server/f14/master: 2/2] Merge branch 'master' into f14

[Adam Jackson]

commit e35779d463af2970700a6180016741e8ff8dc53b
Merge: 118ce31 f340e78
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Oct 13 11:22:47 2010 -0400

    Merge branch 'master' into f14

 xorg-x11-server.spec             |    9 +++++++--
 xserver-1.9.0-qxl-fallback.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
---