[xorg-x11-drv-intel/f18: 3/3] Merge branch 'f19' into f18

[Adam Jackson]

commit b3da7ba439523ac2883e522cb1c0338574cf13ac
Merge: 6732fd1 9cc50cf
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jul 23 15:55:55 2013 -0400

    Merge branch 'f19' into f18

 .gitignore              |    3 +++
 sources                 |    4 ++--
 xorg-x11-drv-intel.spec |   39 ++++++++++++++++++++++++++++-----------
 3 files changed, 33 insertions(+), 13 deletions(-)
---