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

[Tim Waugh]

commit 2fc7906c1ed0a1fbcfa949babecba58bbb9f8f5d
Merge: be89e78 c59a738
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Nov 16 16:12:51 2011 +0000

    Merge branch 'f14' into f15

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