[libgnome-keyring/f14/master: 2/2] merge

[Matthias Clasen]

commit fa75078021bad2c4391aeb772c094040bb1c2425
Merge: fee73b0 85dbb3f
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 29 00:01:06 2010 -0400

    merge

 .gitignore            |    1 +
 libgnome-keyring.spec |    5 +++--
 sources               |    4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 23414d9,21a109d..b03a155
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
  libgnome-keyring-2.30.0.tar.bz2
  /libgnome-keyring-2.31.91.tar.bz2
 +/libgnome-keyring-2.32.0.tar.bz2
+ /libgnome-keyring-2.31.92.tar.bz2
diff --cc libgnome-keyring.spec
index 5aefb82,f25a019..8f20465
--- a/libgnome-keyring.spec
+++ b/libgnome-keyring.spec
@@@ -79,9 -77,9 +77,12 @@@ rm $RPM_BUILD_ROOT%{_libdir}/*.l
  
  
  %changelog
 +* Mon Sep 28 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0-1
 +- Update to 2.32.0
 +
+ * Mon Sep 13 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.31.92-1
+ - Update to 2.31.92
+ 
  * Tue Aug 31 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.91-1
  - Update to 2.31.91
  
diff --cc sources
index a50a152,5ca8217..a91fbb8
--- a/sources
+++ b/sources
@@@ -1,5 -1,1 +1,1 @@@
- <<<<<<< HEAD
- 25446cb9d8e71124b8b79eda5cfc7c4b  libgnome-keyring-2.31.91.tar.bz2
- =======
 -fbed0f6f47211c20608770768516c3a7  libgnome-keyring-2.31.92.tar.bz2
 +c42b2ca66204835d901d3dbfc1fa5ae6  libgnome-keyring-2.32.0.tar.bz2
- >>>>>>> 98e1de7... 2.32.0