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

[Adam Jackson]

commit 598120b71ec8d5ffa7b67e1fd94feb87683d1d87
Merge: 49cae3f 593bba5
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Apr 5 14:17:31 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	xorg-x11-drv-ati.spec

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