[gummi/f14/master: 9/9] Merge branch 'master' into f14

[Fabian Affolter]

commit 0dbfd9d1e56000584f2c6c47779928db11ddb26b
Merge: 3a53c2c 9fba817
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Wed Mar 23 21:06:07 2011 +0100

    Merge branch 'master' into f14

 .gitignore |    4 ++++
 gummi.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc gummi.spec
index eeee34a,7fc5dea..0116f89
--- a/gummi.spec
+++ b/gummi.spec
@@@ -60,6 -60,18 +60,9 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Wed Mar 23 2011 Fabian Affolter <fabian at bernewireless.net> - 0.5.8-1
+ - Updated to new upstream version 0.5.8
+ 
 -* Sun Mar 13 2011 Marek Kasik <mkasik at redhat.com> - 0.5.5-4
 -- Rebuild (poppler-0.16.3)
 -
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.5-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Sun Jan 02 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.5.5-2
 -- rebuild (poppler)
 -
  * Mon Dec 27 2010 Fabian Affolter <fabian at bernewireless.net> - 0.5.5-1
  - Updated to new upstream version 0.5.5