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

[Adam Jackson]

commit 6732fd1bbc0ee716ece4036f195798c8d6cf4196
Merge: 16e7dc5 19d6a05
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue May 28 17:08:55 2013 -0400

    Merge branch 'f19' into f18

 .gitignore              |    1 +
 sources                 |    2 +-
 xorg-x11-drv-intel.spec |   56 +++-------------------------------------------
 3 files changed, 6 insertions(+), 53 deletions(-)
---