[hplip: 5/5] Merge branch 'f16'

[Jiří Popelka]

commit eb758bb12b58f43455bd29dab98063ddf484041e
Merge: f206af9 3da311d
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Nov 16 16:15:08 2011 +0100

    Merge branch 'f16'

 hplip-top-margins-not-respected.patch |   22 ++++++++++++++++++++++
 hplip.spec                            |    9 ++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --cc hplip.spec
index 2434446,89358c9..3ae9d31
--- 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: 8%{?dist}
++Release: 9%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  Conflicts: system-config-printer < 0.6.132
@@@ -531,15 -535,15 +535,18 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-8
++* 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).
+ 
 -* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.10-7
 +* 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-6
 +* 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).