[hplip/f15: 2/2] Merge branch 'f14' into f15

[Tim Waugh]

commit 3ae281bd6a763e8c70c8902dbf7975e122811c7e
Merge: 2fc7906 1bba1aa
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Nov 21 16:07:55 2011 +0000

    Merge branch 'f14' into f15

 hplip-deviceIDs-ppd.patch |  604 +++++++++++++++++++++++----------------------
 hplip.spec                |    6 +-
 2 files changed, 318 insertions(+), 292 deletions(-)
---