[hplip: 3/3] Merge branch 'f15'

[Tim Waugh]

commit 73e3115afdab0b4a748d58a83f3e5ccf2a7087d7
Merge: b3046bf 67034ca
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Oct 17 13:02:17 2011 +0100

    Merge branch 'f15'

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