[gmixer/f14/master: 4/4] Merge commit 'aa7160a04ad1e3b838583aa9946df836dbba3fca' into f14

[Adam Williamson]

commit 9e509c956c1cdf7e045cd40758f88e00f4d33d22
Merge: 3d1ab82 aa7160a
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Feb 17 13:45:26 2011 -0800

    Merge commit 'aa7160a04ad1e3b838583aa9946df836dbba3fca' into f14
    
    Conflicts:
    	gmixer.spec

 gmixer-1.3-tracklist.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 gmixer.spec                |   10 +++++++++-
 2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --cc gmixer.spec
index 4d78b81,addf825..16b96ed
--- a/gmixer.spec
+++ b/gmixer.spec
@@@ -6,7 -6,7 +6,7 @@@
  
  Name:           gmixer
  Version:        1.3
- Release:        18%{?dist}
 -Release:        20%{?dist}
++Release:        19%{?dist}
  Summary:        Just a simple audio mixer
  
  Group:          Applications/Multimedia
@@@ -103,6 -107,13 +107,10 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Thu Feb 17 2011 Adam Williamson <awilliam at redhat.com> - 1.3-20
++* Thu Feb 17 2011 Adam Williamson <awilliam at redhat.com> - 1.3-19
+ - add tracklist.patch to fix the crasher when hitting a mixer device
+   with an empty tracklist (#542255) (thanks Clemens Buchacher)
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-19
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Fri Nov 26 2010 leigh scott <leigh123linux at googlemail.com> - 1.3-18
  - add patch to fix trayicon transparency