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

[Adam Jackson]

commit befc16559973f629b09124581a4706adfd5c2fc1
Merge: e1da299 996f35d
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Aug 18 12:28:23 2011 -0400

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

 xorg-x11-drv-ati.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc xorg-x11-drv-ati.spec
index 3b97a9b,deb731b..ec54ca7
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@@ -6,8 -6,8 +6,8 @@@
  
  Summary:   Xorg X11 ati video driver
  Name:      xorg-x11-drv-ati
 -Version:   6.14.1
 +Version:   6.14.2
- Release:   1.%{gitdate}git%{gitversion}%{?dist}
+ Release:   2.%{gitdate}git%{gitversion}%{?dist}
  URL:       http://www.x.org
  License:   MIT
  Group:     User Interface/X Hardware Support
@@@ -81,9 -81,9 +81,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man4/radeon.4*
  
  %changelog
 -* Thu Aug 18 2011 Adam Jackson <ajax at redhat.com> - 6.14.1-2.20110504gita6d2dba6
++* Thu Aug 18 2011 Adam Jackson <ajax at redhat.com> 6.14.2-2.20110727git8c9266ed2
+ - Rebuild for xserver 1.11 ABI
+ 
 +* Wed Jul 27 2011 Dave Airlie <airlied at redhat.com> 6.14.2-1.20110727git8c9266ed2
 +- bump ati to master
 +
  * Tue May 10 2011 Peter Hutterer <peter.hutterer at redhat.com> 6.14.0-9.20110316gitcdfc007ec
  - Rebuild for what will be server 1.11 one day