[xorg-x11-drv-intel/f17: 4/4] Merge branch 'f18' into f17

[Adam Jackson]

commit a40a8a59b88a3ae8cc5cb37c1dd58bfbb1de6c55
Merge: 46543d9 c59a776
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Oct 19 14:33:20 2012 -0400

    Merge branch 'f18' into f17

 .gitignore                       |    3 +++
 make-intel-gpu-tools-snapshot.sh |    2 +-
 sources                          |    4 ++--
 xorg-x11-drv-intel.spec          |   13 ++++++++++---
 4 files changed, 16 insertions(+), 6 deletions(-)
---