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

[Adam Jackson]

commit 375bee488b8aa349f24993bf9abbb3685305eb29
Merge: e0c7d26 749926c
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 16 10:24:24 2013 -0500

    Merge branch 'f18' into f17

 xorg-x11-drv-intel.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---