[xorg-x11-drv-intel/f16: 3/3] Merge branch 'f17' into f16

[Adam Jackson]

commit 94a255f1f55f358d9f9b326647ad4e0afe0a41e4
Merge: c25a560 6fe5c7d
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue May 29 10:26:28 2012 -0400

    Merge branch 'f17' into f16

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