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

[Tim Waugh]

commit 40d5512fe4f7e33c3b996af09105dd57bb3e6786
Merge: b4ab940 96cd1a1
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 7 15:17:42 2011 +0100

    Merge branch 'f15' into f16

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