[xorg-x11-drv-intel/f18: 5/5] Merge branch 'master' into f18

[Adam Jackson]

commit 39544b53eb4edc0c2f193893a4a54c390a02715c
Merge: cb2a6d3 e84d633
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Mar 7 16:39:54 2013 -0500

    Merge branch 'master' into f18

 .gitignore              |    1 +
 sources                 |    2 +-
 xorg-x11-drv-intel.spec |   14 +++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index ceabbad,88b1d4f..4144507
--- a/.gitignore
+++ b/.gitignore
@@@ -32,6 -32,6 +32,7 @@@ xf86-video-intel-2.10.0.tar.bz
  /xf86-video-intel-2.20.16.tar.bz2
  /xf86-video-intel-2.20.17.tar.bz2
  /xf86-video-intel-2.20.18.tar.bz2
 +/xf86-video-intel-2.20.19.tar.bz2
  /xf86-video-intel-2.21.2.tar.bz2
  /intel-gpu-tools-20130212.tar.bz2
+ /xf86-video-intel-2.21.3.tar.bz2