[hplip/f14/master: 3/3] Merge branch 'f13' into f14

[Tim Waugh]

commit afcce253b3d5a4cbf6b2e0d816076b63bcba046e
Merge: 62bd21f 0577f67
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 29 16:06:00 2010 +0100

    Merge branch 'f13' into f14

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