commit b3046bf4ec51cef42ba79e87da8f1805830f39e7 Merge: 11e74b0 204e2de Author: Tim Waugh <twaugh at redhat.com> Date: Wed Oct 12 15:25:16 2011 +0100 Merge branch 'f15' into f16 hplip-deviceIDs-drv.patch | 11 ++++++++++- hplip.spec | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) ---