[hplip/f19: 2/2] Merge branch 'f18' into f19

[Tim Waugh]

commit 75066ab94b4d2d30a137361464caa473924fae1b
Merge: 33d387d 2c92ca6
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Mar 15 09:38:43 2013 +0000

    Merge branch 'f18' into f19

 hplip-logdir.patch |   38 +++++++++++++++++++-------------------
 hplip.spec         |    9 ++++++++-
 2 files changed, 27 insertions(+), 20 deletions(-)
---