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

[Tim Waugh]

commit e15a38a90d96e8f8114f1733f315e03a4f9a2903
Merge: 84d7035 62bd21f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Oct 18 17:40:23 2010 +0100

    Merge branch 'f14'

 hplip-hpijs-marker-supply.patch    |   31 +++++++++++++++++++++++++++++++
 hplip-raw_deviceID-traceback.patch |   24 ++++++++++++++++++++++++
 hplip.spec                         |   14 +++++++++++++-
 3 files changed, 68 insertions(+), 1 deletions(-)
---