[xorg-x11-drv-intel/f17: 8/8] Merge branch 'master' into f17

[Adam Jackson]

commit e130bccb593342097f95de1fe3cc5e7882ac28d1
Merge: e873727 006c8b0
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jul 23 13:12:22 2012 -0400

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

 .gitignore              |    4 +
 copy-fb.patch           |  151 -----------------------------------------------
 sources                 |    2 +-
 xorg-x11-drv-intel.spec |   40 +++++++++----
 4 files changed, 34 insertions(+), 163 deletions(-)
---