[krename/f14/master: 2/2] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/krename into f14

[Radek Novacek]

commit 011203a868e33470ad70e3920b4dca2b65043457
Merge: 09733ca a55930a
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Mon Jan 31 13:53:29 2011 +0100

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/krename into f14
    
    Conflicts:
    	krename.spec

 krename.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc krename.spec
index 1afcb72,910e2ce..6424db2
--- a/krename.spec
+++ b/krename.spec
@@@ -82,9 -82,9 +82,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
 +* Mon Jan 31 2011 Radek Novacek <rnovacek at redhat.com> - 4.0.6-1
 +- Update to 4.0.6
 +
+ * Wed Sep 29 2010 jkeating - 4.0.4-1.1
+ - Rebuilt for gcc bug 634757
+ 
  * Mon Sep 13 2010 Radek Novacek <rnovacek at redhat.com> - 4.0.4-1
  - Update to 4.0.4