[xorg-x11-drv-intel/f16: 9/9] Merge branch 'master' into f16

[Adam Jackson]

commit f902ae52b87dfd6274b43717c4313e13b0dc19f3
Merge: c8f8926 535a197
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Dec 13 10:24:55 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore
    	xorg-x11-drv-intel.spec

 ...xa-Fix-clip-processing-for-uxa_fill_spans.patch |   53 ++++++++++++++++++++
 intel-2.17.0-legacy-dri1.patch                     |   16 ++++++
 xorg-x11-drv-intel.spec                            |   31 +++++++++---
 3 files changed, 93 insertions(+), 7 deletions(-)
---