[hplip/f15: 3/4] Merge branch 'f14' into f15

[Tim Waugh]

commit a1bddb8a323e5066b584cba874f7b588ccb6aeef
Merge: 1298b44 dad70eb
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jun 10 11:00:39 2011 +0100

    Merge branch 'f14' into f15

 hpcups-update-ppds.sh |    4 ----
 hplip.spec            |    5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)
---