[xorg-x11-drv-ati/f17: 2/2] Merge branch 'master' into f17

[Jerome Glisse]

commit 0583f9ded74c53bb1d2fed5e418d12f70fb60733
Merge: a03deb9 1a2ca23
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Thu Apr 12 14:51:43 2012 -0400

    Merge branch 'master' into f17

 xorg-x11-drv-ati.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---