[hplip/f16: 3/3] Merge branch 'f15' into f16

Tue Oct 4 14:51:14 UTC 2011

commit b4ab94053452496b51e4a4dd4fd4bf03701feef2
Merge: 1697839 ef4ea0c
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Oct 4 16:36:06 2011 +0200

    Merge branch 'f15' into f16

 .gitignore                |    1 +
 hplip-3.11.10.tar.gz.asc  |    7 +
 hplip-3.11.7.tar.gz.asc   |    7 -
 hplip-CVE-2011-2722.patch |   21 ---
 hplip-cups15.patch        |   11 --
 hplip-deviceIDs-drv.patch |  373 +++++++++++++++++++++++----------------------
 hplip-hpcups-crash.patch  |   12 --
 hplip-sane-crash.patch    |   25 ---
 hplip.spec                |  113 ++++++--------
 sources                   |    2 +-
 10 files changed, 249 insertions(+), 323 deletions(-)
---