[gnome-settings-daemon/f14/master: 2/2] merge

[Matthias Clasen]

commit 3eca1c009bfa139b226cf52bc38567b16bc14ab6
Merge: 7573833 e089a1f
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Sep 30 07:22:20 2010 -0400

    merge

 gnome-settings-daemon.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gnome-settings-daemon.spec
index acef0c6,9eaf775..a87debd
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@@ -120,9 -120,9 +120,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_libdir}/pkgconfig/gnome-settings-daemon.pc
  
  %changelog
 +* Thu Sep 30 2010 Matthias Clasen <mclasen at redhat.com> 2.32.0-1
 +- Update to 2.32.0
 +
+ * Wed Sep 29 2010 jkeating - 2.31.91-2.1
+ - Rebuilt for gcc bug 634757
+ 
  * Wed Sep  1 2010 Matthias Clasen <mclasen at redhat.com> 2.31.91-2
  - Fix display capplet invokation (#628835)