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

[Adam Jackson]

commit cbd05d724c0f226231b5265fed93e0870a5574da
Merge: 375bee4 cb2a6d3
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Feb 12 13:52:00 2013 -0500

    Merge branch 'f18' into f17

 .gitignore              |    3 +
 sources                 |    4 +-
 xorg-x11-drv-intel.spec |  644 ++---------------------------------------------
 3 files changed, 20 insertions(+), 631 deletions(-)
---