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

[Dave Airlie]

commit a8d38756992fbbc742c3cc57317bc9adf3c9bfc1
Merge: 1e95a0d 0239e87
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 12 14:28:53 2012 +1000

    Merge branch 'master' into f18

 ...n-t-use-display-for-vx-vy-for-gpu-screens.patch |   30 +++++++++++++++
 ...plug-cleanup-properly-if-the-screen-fails.patch |   38 ++++++++++++++++++++
 xorg-x11-server.spec                               |    9 ++++-
 3 files changed, 76 insertions(+), 1 deletions(-)
---