[hplip: 5/5] Merge branch 'f13' into f14

[Tim Waugh]

commit 0d9b39fc27a39aa2a7854256c5eaa24269613bb0
Merge: ce3d18c 62a88db
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Aug 25 12:11:45 2010 +0100

    Merge branch 'f13' into f14

 hplip-fax-ppd.patch     |   20 ++++++++++++++++++++
 hplip-snmp-quirks.patch |   17 +++++++++++++----
 hplip.spec              |   12 +++++++++++-
 3 files changed, 44 insertions(+), 5 deletions(-)
---