Merge branch 'f15'

Conflicts:
	GConf2.spec

.gitignore

@@ -3,3 +3,4 @@ GConf-2.31.7.tar.bz2
 /GConf-2.31.91.tar.bz2
 /GConf-2.32.0.tar.bz2
 /GConf-2.32.1.tar.bz2
+/GConf-2.32.2.tar.bz2

GConf2.spec

@@ -6,8 +6,8 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.32.1
-Release: 7%{?dist}
+Version: 2.32.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 #VCS: git:git://git.gnome.org/gconf
@@ -166,7 +166,10 @@ fi
 %doc %{_mandir}/man1/gsettings-schema-convert.1*
 
 %changelog
-* Thu Feb 10 2011 Matthias Clasen <mclasen@redhat.com> 2.32.1-7
+* Mon Apr  4 2011 Matthias Clasen <mclasen@redhat.com> 2.32.2-1
+- Update to 2.32.2
+
+* Thu Feb 10 2011 Matthias Clasen <mclasen@redhat.com> 2.32.1-8
 - Rebuild against newer gtk3
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.32.1-6

sources

@@ -1 +1 @@
-e3952c493cabee2903690fc4d203dca3  GConf-2.32.1.tar.bz2
+0d19e59b8997b9968695ca863dd0acc8  GConf-2.32.2.tar.bz2