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

[Jiří Popelka]

commit 876d35656d3f1f42085f0fd2db2cbe83d5b0ae2c
Merge: df33be4 06e0fb6
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Oct 11 09:24:13 2012 +0200

    Merge branch 'f17' into f18

 .gitignore                |    1 +
 hplip-3.12.10.tar.gz.asc  |    7 -------
 hplip-3.12.10a.tar.gz.asc |    7 +++++++
 hplip.spec                |   11 ++++++++---
 sources                   |    2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)
---