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

Mon Oct 4 14:52:54 UTC 2010

commit 0253be51d58b8b49579bbca4cf00bae7d9471641
Merge: 777b861 d5d9b6b
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Oct 4 16:03:59 2010 +0200

    Merge branch 'f14'

 .gitignore                      |    1 +
 hplip-3.10.6.tar.gz.asc         |    7 -------
 hplip-3.10.9.tar.gz.asc         |    7 +++++++
 hplip-device-reconnected.patch  |   36 ------------------------------------
 hplip-pstotiff-is-rubbish.patch |    2 +-
 hplip.spec                      |   11 +++++------
 sources                         |    2 +-
 7 files changed, 15 insertions(+), 51 deletions(-)
---