[hplip: 2/3] Merge branch 'f16' into f17

Fri Sep 7 13:59:24 UTC 2012

commit 5e3cc2a8cd5a611d0141f7cd3c097fe438d449ba
Merge: cc5cbe5 b906ef1
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Sep 7 15:48:24 2012 +0200

    Merge branch 'f16' into f17

 .gitignore                 |    1 +
 hplip-3.12.6.tar.gz.asc    |    7 -------
 hplip-3.12.9.tar.gz.asc    |    7 +++++++
 hplip-addprinter.patch     |   22 +++++++++++-----------
 hplip-deviceIDs-drv.patch  |    9 ---------
 hplip-fax-ppd.patch        |   24 ------------------------
 hplip-makefile-chgrp.patch |   20 +++++++++++++++-----
 hplip-udev-rules.patch     |    2 +-
 hplip.spec                 |   19 ++++++++++++-------
 sources                    |    2 +-
 10 files changed, 48 insertions(+), 65 deletions(-)
---