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

[Tim Waugh]

commit d709f97623548ed1f5332fd8fe62252864e37e53
Merge: ef8c5d9 3f6b7b8
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jan 12 15:39:17 2011 +0000

    Merge branch 'f14'

 hplip.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---