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

[Jiří Popelka]

commit e1a4af0ad15a752daadade079b9e433259269a10
Merge: ad385de b641858
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 25 14:23:50 2011 +0200

    Merge branch 'f14' into f15

 .gitignore                      |    1 +
 hplip-3.11.3a.tar.gz.asc        |    7 -
 hplip-3.11.7.tar.gz.asc         |    7 +
 hplip-env-python.patch          |  315 ---------------------------------------
 hplip-pstotiff-is-rubbish.patch |   12 +-
 hplip-udev-rules.patch          |   13 +-
 hplip.spec                      |   15 +-
 sources                         |    1 +
 8 files changed, 29 insertions(+), 342 deletions(-)
---