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