commit 67034ca59c4c03ed1f39581451121b8cc1b51a8f Merge: 204e2de 095d3bc Author: Tim Waugh <twaugh at redhat.com> Date: Mon Oct 17 13:01:17 2011 +0100 Merge branch 'f14' into f15 hplip-deviceIDs-drv.patch | 11 ++++++++++- hplip.spec | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) ---