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

[Tim Waugh]

commit 204e2de9101577730b4309984939a2e487dabe3d
Merge: 917d744 5e01868
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Oct 12 15:25:01 2011 +0100

    Merge branch 'f14' into f15

 hplip-deviceIDs-drv.patch |   11 ++++++++++-
 hplip.spec                |    6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)
---