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

[Adam Jackson]

commit f1f8f22e310722a44a052de69daaec10643a891a
Merge: ec9e283 98a0b63
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Sep 4 09:24:01 2012 -0400

    Merge branch 'f18' into f17

 .gitignore              |    1 +
 sources                 |    2 +-
 xorg-x11-drv-intel.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---