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

[Adam Jackson]

commit 90cf3df55b6f97de39784c82074be3f2c6735f66
Merge: eef05be e54581c
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 17 11:57:00 2012 -0500

    Merge branch 'f18' into f17

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