[system-config-printer/f14/master: 2/2] Merge branch 'f13' into f14

[Tim Waugh]

commit 20c2cec91337d9def29b777037869f659dc359f0
Merge: 591e46e c42ae0e
Author: Tim Waugh <twaugh at redhat.com>
Date:   Sun Aug 22 17:29:14 2010 +0100

    Merge branch 'f13' into f14

 .gitignore                 |    1 +
 pysmbc-1.0.7.tar.bz2.sig   |    7 -------
 pysmbc-1.0.9.tar.bz2.asc   |    7 +++++++
 pysmbc-doczip.patch        |   12 ++++++++++++
 sources                    |    2 +-
 system-config-printer.spec |   13 ++++++++++---
 6 files changed, 31 insertions(+), 11 deletions(-)
---
diff --cc system-config-printer.spec
index d5035ff,3ec9e98..aeedfde
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@@ -194,9 -198,9 +198,12 @@@ rm -rf %buildroo
  exit 0
  
  %changelog
+ * Sun Aug 22 2010 Tim Waugh <twaugh at redhat.com>
+ - Updated pysmbc to 1.0.9.
+ 
 +* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 1.2.3-5
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 +
  * Mon Jul 12 2010 Jiri Popelka <jpopelka at redhat.com> 1.2.3-4
  - Moved COPYING file to libs sub-package.