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

[Tim Waugh]

commit c43cf0eae7f36c38a240f5483dc51411c98d7243
Merge: 4439b57 1cf6962
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Sep 2 16:14:56 2011 +0100

    Merge branch 'f15' into f16

 hplip-hpcups-crash.patch |   12 ++++++++++++
 hplip.spec               |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---