[hplip: 3/3] Merge branch 'f18'

[Tim Waugh]

commit 173d4189f22b476fb3002bf01f630e1570f36e1d
Merge: 10f5443 bd41d67
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Oct 16 11:39:32 2012 +0100

    Merge branch 'f18'

 hplip-logdir.patch |  261 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 hplip.spec         |    9 ++-
 2 files changed, 269 insertions(+), 1 deletions(-)
---