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

[Tim Waugh]

commit 2a8060dc14bfff46d7aaf1607ef7f586743ee041
Merge: bd41d67 fb67ace
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Oct 17 10:05:42 2012 +0100

    Merge branch 'f17' into f18

 hplip-logdir.patch |   84 ++++++++++++++++++++++++++++++++++++++++++++++-----
 hplip.spec         |    6 +++-
 2 files changed, 80 insertions(+), 10 deletions(-)
---