[system-config-printer: 2/2] Merge branch 'f18'

[Tim Waugh]

commit f9fe69a7a74f4ab664188f1103032f91d44c6d61
Merge: a394ae4 aa9ac4d
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Feb 27 16:31:47 2013 +0000

    Merge branch 'f18'

 system-config-printer.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --cc system-config-printer.spec
index 7854962,a700691..c10bdbf
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: A printer administration tool
  Name: system-config-printer
  Version: 1.3.12
--Release: 8%{?dist}
++Release: 9%{?dist}
  License: GPLv2+
  URL: http://cyberelk.net/tim/software/system-config-printer/
  Group: System Environment/Base
@@@ -178,9 -175,9 +175,12 @@@ touch %buildroot%{_localstatedir}/run/u
  exit 0
  
  %changelog
 -* Wed Feb 27 2013 Tim Waugh <twaugh at redhat.com> 1.3.12-8
++* Wed Feb 27 2013 Tim Waugh <twaugh at redhat.com> 1.3.12-9
+ - Disable the print applet in KDE again.
+ 
 +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.12-8
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Mon Nov 26 2012 Tim Waugh <twaugh at redhat.com> 1.3.12-7
  - Enable the print applet in KDE (only on Red Hat Enterprise Linux).