[libgnome-keyring/f14/master: 1/2] 2.32.0

[Matthias Clasen]

commit fee73b0af1d539f3eda60a6673c27ba83b1125a2
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Sep 28 23:59:23 2010 -0400

    2.32.0

 .gitignore            |    1 +
 libgnome-keyring.spec |    7 +++++--
 sources               |    4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b56ac7..23414d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libgnome-keyring-2.30.0.tar.bz2
 /libgnome-keyring-2.31.91.tar.bz2
+/libgnome-keyring-2.32.0.tar.bz2
diff --git a/libgnome-keyring.spec b/libgnome-keyring.spec
index 185f7a7..5aefb82 100644
--- a/libgnome-keyring.spec
+++ b/libgnome-keyring.spec
@@ -5,12 +5,12 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: libgnome-keyring
-Version: 2.31.91
+Version: 2.32.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/libgnome-keyring
-Source: http://download.gnome.org/sources/libgnome-keyring/2.31/libgnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/libgnome-keyring/2.32/libgnome-keyring-%{version}.tar.bz2
 URL: http://live.gnome.org/GnomeKeyring
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -79,6 +79,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Mon Sep 28 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0-1
+- Update to 2.32.0
+
 * Tue Aug 31 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.91-1
 - Update to 2.31.91
 
diff --git a/sources b/sources
index ffdea27..a50a152 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 25446cb9d8e71124b8b79eda5cfc7c4b  libgnome-keyring-2.31.91.tar.bz2
+=======
+c42b2ca66204835d901d3dbfc1fa5ae6  libgnome-keyring-2.32.0.tar.bz2
+>>>>>>> 98e1de7... 2.32.0