[hplip/f14/master: 2/2] Merge branch 'f13' into f14

[Tim Waugh]

commit 8f5a3bc5f9eae8af4df8f358f90153256d65fa57
Merge: 3f6b7b8 18e2379
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jan 12 16:55:07 2011 +0000

    Merge branch 'f13' into f14

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