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

[Tim Waugh]

commit c1c52b85c1036b8899eb6474608722a4eeed75e1
Merge: d709f97 8f5a3bc
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jan 12 16:55:15 2011 +0000

    Merge branch 'f14'

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