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

[Tim Waugh]

commit 96cd1a1ed4437a863eb8fac7e0b44e8ea5fe275b
Merge: ef4ea0c 9119755
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 7 15:14:05 2011 +0100

    Merge branch 'f14' into f15

 hplip-deviceIDs-drv.patch |   22 +++++++++++-----------
 hplip.spec                |    9 ++++++++-
 2 files changed, 19 insertions(+), 12 deletions(-)
---