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

[Tim Waugh]

commit 8708e936953484fff3625ae969f1d85656674aff
Merge: 20c2cec 6834418
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Aug 23 09:41:48 2010 +0100

    Merge branch 'f13' into f14

 system-config-printer.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc system-config-printer.spec
index aeedfde,5c20dce..86ea105
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@@ -7,7 -7,7 +7,7 @@@
  Summary: A printer administration tool
  Name: system-config-printer
  Version: 1.2.3
--Release: 5%{?dist}
++Release: 6%{?dist}
  License: GPLv2+
  URL: http://cyberelk.net/tim/software/system-config-printer/
  Group: System Environment/Base
@@@ -198,12 -198,9 +198,12 @@@ rm -rf %buildroo
  exit 0
  
  %changelog
- * Sun Aug 22 2010 Tim Waugh <twaugh at redhat.com>
 -* Sun Aug 22 2010 Tim Waugh <twaugh at redhat.com> - 1.2.3-5
++* Sun Aug 22 2010 Tim Waugh <twaugh at redhat.com> - 1.2.3-6
  - 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.