[hplip: 2/2] Merge branch 'f14'

[Jiří Popelka]

commit 5829db5a0e8858bdfec8c48524bd0e5f0afca52c
Merge: 03e2bb5 2347ef5
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jan 24 12:44:34 2011 +0100

    Merge branch 'f14'

 .gitignore                 |    1 +
 hplip-3.10.9.tar.gz.asc    |    7 -------
 hplip-3.11.1.tar.gz.asc    |    7 +++++++
 hplip-addgroup.patch       |   14 --------------
 hplip-addprinter.patch     |   20 ++++++++++----------
 hplip-cups-web.patch       |   24 ------------------------
 hplip-dbglog-newline.patch |   38 +++++++++++++++++++-------------------
 hplip-fax-ppd.patch        |   14 +++++++++-----
 hplip-openPPD.patch        |   24 ------------------------
 hplip.spec                 |   23 +++++++----------------
 sources                    |    2 +-
 11 files changed, 54 insertions(+), 120 deletions(-)
---