[hplip/f14/master: 2/2] Merge branch 'f13' into f14

[Tim Waugh]

commit c737dc04229bf0ffd26fe0b1327c90ebb7111612
Merge: 2347ef5 9debef7
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Feb 4 13:46:54 2011 +0000

    Merge branch 'f13' into f14

 hplip-hpijs-marker-supply.patch |    2 +-
 hplip.spec                      |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc hplip.spec
index 7718244,ce17130..9f6b6a5
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
 -Version: 3.10.9
 -Release: 15%{?dist}
 +Version: 3.11.1
- Release: 1%{?dist}
++Release: 2%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  Conflicts: system-config-printer < 0.6.132
@@@ -513,9 -529,10 +513,13 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Fri Feb  4 2011 Tim Waugh <twaugh at redhat.com> - 3.10.9-15
++* Fri Feb  4 2011 Tim Waugh <twaugh at redhat.com> - 3.11.1-2
+ - Fixed typo causing ";marker-supply-low-warning" state reason to be
+   reported by hpijs (bug #675151).
+ 
 +* Mon Jan 24 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.1-1
 +- 3.11.1
 +
  * Mon Jan 17 2011 Tim Waugh <twaugh at redhat.com> - 3.10.9-14
  - Applied patch to fix CVE-2010-4267, remote stack overflow
    vulnerability (bug #670252).