[hplip/f15: 2/2] Merge branch 'f14' into f15

[Tim Waugh]

commit 99e97dbad08aae33295a835067b816121c3c97c0
Merge: 4b337bf f6778bf
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Sep 23 13:43:32 2011 +0100

    Merge branch 'f14' into f15

 hplip-pstotiff-is-rubbish.patch |    2 +-
 hplip.spec                      |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---