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

[Tim Waugh]

commit 8baddebf77c993577e588647e138414cca202d91
Merge: eb758bb 2fc7906
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Nov 16 16:30:52 2011 +0000

    Merge branch 'f15' into f16

 hplip-deviceIDs-drv.patch |   11 ++++++++++-
 hplip.spec                |    6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --cc hplip.spec
index 3ae9d31,e40a367..032c9ee
--- 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: 9%{?dist}
 -Release: 7%{?dist}
++Release: 10%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  Conflicts: system-config-printer < 0.6.132
@@@ -535,21 -532,15 +536,24 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Wed Nov 16 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-7
++* Wed Nov 16 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-10
+ - Corrected IEEE 1284 Device ID for LaserJet M1120 MFP (bug #754139).
+ 
 -* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
 +* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-9
  - revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
  
 -* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
 +* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.10-8
 +- Rebuilt for glibc bug#747377
 +
 +* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-7
  - Catch DBusException in hp-systray (bug #746024).
  
 +* Mon Oct 24 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
 +- Move udev rules to /lib/udev/rules.d (bug #748208).
 +
 +* 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)