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

[Adam Jackson]

commit ec9e283c5fac4e8b69989504cc6d6f81199e9bed
Merge: 920ef13 7c9d8b1
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Aug 30 12:13:34 2012 -0400

    Merge branch 'f18' into f17

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