[matahari/f16: 2/2] Merge branch 'master' into f16

[Zane Bitter]

commit f3b2afd1f5fa54ce897772e0f27fae8ccd85125c
Merge: 13dacfe 68ec3f7
Author: Zane Bitter <zbitter at redhat.com>
Date:   Mon Jan 2 17:42:35 2012 +0100

    Merge branch 'master' into f16
    
    Signed-off-by: Zane Bitter <zbitter at redhat.com>

 .gitignore                   |    1 +
 matahari-0.0.5-gcc-fix.patch |   50 -------------------
 matahari-lsb.patch           |   19 -------
 matahari-no-qpidd.patch      |   40 ---------------
 matahari-qmf-lib.patch       |   50 -------------------
 matahari.spec                |  112 ++++++++++++++++++++++++++++++++++++++++--
 sources                      |    2 +-
 7 files changed, 109 insertions(+), 165 deletions(-)
---
diff --cc matahari.spec
index b459bab,e0bd536..36b72d9
--- a/matahari.spec
+++ b/matahari.spec
@@@ -669,6 -768,9 +768,9 @@@ test "x%{buildroot}" != "x" && rm -rf %
  %endif
  
  %changelog
 -* Thu Dec 22 2011 Zane Bitter <zbitter at redhat.com> 0.6.0-1
++* Mon Jan 2  2012 Zane Bitter <zbitter at redhat.com> 0.6.0-1
+ - New upstream release
+ 
  * Fri Oct 21 2011 Adam Stokes <astokes at fedoraproject.org> 0.5.0
  - New upstream release