[hplip/f14/master: 2/2] Merge branch 'f13' into f14

[Jiří Popelka]

commit a0eb155f8d7d1de0d92d924374cb14b14b0f83ef
Merge: a0517a0 be4daf8
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Dec 3 18:00:55 2010 +0100

    Merge branch 'f13' into f14

 hplip-deviceIDs-drv.patch |   20 +++++++++++++++++++-
 hplip-deviceIDs-ppd.patch |   11 +++++++++++
 hplip.spec                |   21 ++++++++++++++++-----
 3 files changed, 46 insertions(+), 6 deletions(-)
---