[gnome-color-manager: 8/8] Merge branch 'f16'

[Adam Jackson]

commit fac72e28cd28e5d5a419df9479639ea26c4f4273
Merge: 6f03484 60e557f
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Nov 3 17:22:29 2011 -0400

    Merge branch 'f16'
    
    Conflicts:
    	gnome-color-manager.spec

 .gitignore               |    1 +
 gnome-color-manager.spec |    9 +++++----
 sources                  |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --cc gnome-color-manager.spec
index 73db797,65a541d..f03e81a
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@@ -104,9 -102,9 +102,12 @@@ glib-compile-schemas %{_datadir}/glib-2
  %{_datadir}/dbus-1/services/org.gnome.ColorManager.service
  
  %changelog
+ * Mon Oct 17 2011 Richard Hughes <rhughes at redhat.com> - 3.2.1-1
+ - New upstream version.
+ 
 +* Fri Oct 14 2011 Rex Dieter <rdieter at fedoraproject.org> - 3.2.0-4
 +- rebuild (exiv2)
 +
  * Thu Oct 06 2011 Adam Jackson <ajax at redhat.com> 3.2.0-3
  - 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch: Backport
    a crash fix from mainline.