commit 1cf69629f47b8be6d8f7d960ef1e6952269eff6b
Merge: 6e8c4b0 de1690c
Author: Tim Waugh <twaugh at redhat.com>
Date: Fri Sep 2 16:11:01 2011 +0100
Merge branch 'f14' into f15
hplip-hpcups-crash.patch | 12 ++++++++++++
hplip.spec | 9 ++++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---