[hplip/f16: 3/3] Merge branch 'f15' into f16

[Tim Waugh]

commit 8dcda335219114cc94e5e72adc1df1d41776bb83
Merge: b2fd2a6 9c46c84
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Oct 25 16:11:52 2011 +0100

    Merge branch 'f15' into f16

 hplip-systray-dbus-exception.patch |   18 ++++++++++++++++++
 hplip.spec                         |    9 ++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --cc hplip.spec
index 0291abd,12e1375..ece2a94
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
  Version: 3.11.10
--Release: 5%{?dist}
++Release: 6%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  Conflicts: system-config-printer < 0.6.132
@@@ -527,9 -527,9 +531,12 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
++* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-6
+ - Catch DBusException in hp-systray (bug #746024).
+ 
 +* Thu Oct 20 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
 +- Pay attention to the SANE localOnly flag in hpaio (bug #743593).
 +
  * Mon Oct 17 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-4
  - Corrected IEEE 1284 Device ID for LaserJet M1319f MFP (bug #746614)