[xorg-x11-drv-nouveau/f18: 9/9] Merge branch 'f19' into f18

[Adam Jackson]

commit 05395e215f05a750a763e8a8a420781ef6e89815
Merge: 9d7122c 48a83b9
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue May 28 17:10:30 2013 -0400

    Merge branch 'f19' into f18

 .gitignore                |    1 +
 sources                   |    2 +-
 xorg-x11-drv-nouveau.spec |   34 ++++++++++++++++++++++++----------
 3 files changed, 26 insertions(+), 11 deletions(-)
---