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

[Jiří Popelka]

commit 33d7337a9dfc8cd03b4d0de9e6bcf80f6801e4ac
Merge: 559761c a0517a0
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Dec 3 17:02:51 2010 +0100

    Merge branch 'f14'

 hplip-deviceIDs-drv.patch |  507 +++++++++++++++++++++++++++++++--------------
 hplip-deviceIDs-ppd.patch |  308 +++++++++++++++++++++++++++
 hplip.spec                |   17 ++-
 3 files changed, 672 insertions(+), 160 deletions(-)
---