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

[Adam Jackson]

commit 5d38543c079af530c5a560d52d293bc7767c842f
Merge: 10e9f6e d522ed5
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Oct 22 10:09:19 2012 -0400

    Merge branch 'f18' into f17

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