[hplip: 2/2] Merge branch 'f16'

[Tim Waugh]

commit 5ab6441080a2109db9edc9276d139e3c6ef79bf6
Merge: 24ddd6a b2fd2a6
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Oct 20 16:25:01 2011 +0100

    Merge branch 'f16'

 hplip-hpaio-localonly.patch |   45 +++++++++++++++++++++++++++++++++++++++++++
 hplip.spec                  |    9 +++++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---