[simple-scan/f14/master: 7/7] Update to 2.32.0.1 http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk/revision/470#NEWS

[Rahul Sundaram]

commit fc99e1993499619a6c3766d2ccfe8e5d722d6b8c
Merge: cb62d74 8c23d67
Author: Rahul <sundaram at fedoraproject.org>
Date:   Tue Mar 1 12:37:32 2011 +0530

    Update to 2.32.0.1
    http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk/revision/470#NEWS

 .gitignore       |    4 ++++
 simple-scan.spec |    8 ++++++--
 sources          |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 3d671ff,9472864..ad0c293
--- a/.gitignore
+++ b/.gitignore
@@@ -2,4 -2,4 +2,8 @@@ simple-scan-2.31.5.tar.bz
  /simple-scan-2.31.90.1.tar.bz2
  /simple-scan-2.31.90.2.tar.bz2
  /simple-scan-2.31.91.tar.bz2
++<<<<<<< HEAD
 +/simple-scan-2.32.0.tar.bz2
++=======
+ /simple-scan-2.32.0.1.tar.gz
++>>>>>>> master
diff --cc simple-scan.spec
index 4a51c64,c2c5909..36d7297
--- a/simple-scan.spec
+++ b/simple-scan.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           simple-scan
- Version:        2.32.0
+ Version:        2.32.0.1
 -Release:        2%{?dist}
 +Release:        1%{?dist}
  Summary:        Simple scanning utility
  
  Group:          Applications/Multimedia
@@@ -52,8 -52,11 +52,12 @@@ make install DESTDIR=$RPM_BUILD_ROO
  %{_datadir}/simple-scan/
  
  %changelog
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.0.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Thu Nov 11 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0.1-1
++* Tue Mar 01 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 2.32.0.1-1
+ - Update to 2.32.0.1
++- http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk/revision/470#NEWS
++
 +* Wed Sep 29 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