[gummi/f16: 13/13] Merge branch 'master' into f16

[Fabian Affolter]

commit b6cb558c412f58005ac72462a3c9bbf7720bef74
Merge: ddba015 dd48031
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Dec 2 22:58:53 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	gummi.spec

 .gitignore                |    1 +
 gummi-0.6.0-linking.patch |   11 +++++++++
 gummi.spec                |   50 +++++++++++++++++++++++++++++++-------------
 sources                   |    2 +-
 4 files changed, 48 insertions(+), 16 deletions(-)
---
diff --cc gummi.spec
index c551966,6d535cc..490ebac
--- a/gummi.spec
+++ b/gummi.spec
@@@ -60,12 -62,24 +62,30 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Mon Nov 28 2011 Marek Kasik <mkasik at redhat.com> - 0.6.0-2
+ - Add output of "pkg-config --libs gthread-2.0" to Makefile.in to fix build
+ 
+ * Thu Nov 17 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.6.0-1
+ - Updated to new upstream version 0.6.0
+ 
+ * Fri Oct 28 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.5.8-6
+ - rebuild(poppler)
+ 
+ * Fri Sep 30 2011 Marek Kasik <mkasik at redhat.com> - 0.5.8-5
+ - Rebuild (poppler-0.18.0)
+ 
+ * Mon Sep 19 2011 Marek Kasik <mkasik at redhat.com> - 0.5.8-4
+ - Rebuild (poppler-0.17.3)
+ 
 -* Fri Aug 12 2011 Fabian Affolter <fabian at bernewireless.net> - 0.5.8-3
++* Fri Aug 12 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.5.8-3
+ - Rebuild (libgtksourceview)
+ 
 +* Mon Oct  3 2011 Marek Kasik <mkasik at redhat.com> - 0.5.8-4
 +- Rebuild (poppler-0.18.0 stable)
 +
 +* Wed Sep 21 2011 Marek Kasik <mkasik at redhat.com> - 0.5.8-3
 +- Rebuild (poppler-0.17.3)
 +
  * Fri Jul 15 2011 Marek Kasik <mkasik at redhat.com> - 0.5.8-2
  - Rebuild (poppler-0.17.0)