[xorg-x11-drv-cirrus/f15/master: 3/3] Merge branch 'master' into f15

[Adam Jackson]

commit 68ad22f76e3c4cceef3ea62307a30be082fbffa2
Merge: 54f9759 8e85bfe
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 19 11:05:58 2011 -0400

    Merge branch 'master' into f15
    
    Conflicts:
    	xorg-x11-drv-cirrus.spec

 cirrus-1.2.0-qemu.patch  |   12 ++----------
 xorg-x11-drv-cirrus.spec |   12 +++++++++---
 2 files changed, 11 insertions(+), 13 deletions(-)
---