[gmixer/f13/master: 8/8] Merge branch 'master' into f13

[tomspur]

commit 536262ed10f64f4a7ef2dbe3e342c8ea431831c3
Merge: 5f1fedc c979eb9
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Tue Sep 28 18:50:16 2010 +0200

    Merge branch 'master' into f13
    
    fixes bugs: 537803 and 638277
    
    Conflicts:
    	gmixer.spec

 gmixer-1.3-local-variable-not-assigned.patch |   12 ++++++++++++
 gmixer-1.3-no-title.patch                    |   17 +++++++++++++++++
 gmixer.spec                                  |   20 +++++++++++++++++++-
 3 files changed, 48 insertions(+), 1 deletions(-)
---
diff --cc gmixer.spec
index 686ee2e,3a6939e..8ccfdaf
--- a/gmixer.spec
+++ b/gmixer.spec
@@@ -90,11 -101,18 +101,18 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Tue Sep 28 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.3-17
+ - add patch to fix #537803
+ - add patch fo fix #638277
+ 
+ * Fri Jul 30 2010 leigh scott <leigh123linux at googlemail.com> - 1.3-16
+ - rebuild
+ 
 -* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.3-15
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 +* Tue Mar 16 2010 leigh scott <leigh123linux at googlemail.com> - 1.3-15
 +- complete the icon patch so it works
  
  * Tue Mar 16 2010 leigh scott <leigh123linux at googlemail.com> - 1.3-14
 -- complete the icon patch so it works
 +- actually add the icon patch
  
  * Tue Mar 16 2010 leigh scott <leigh123linux at googlemail.com> - 1.3-13
  - Fix icon naming