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

[Tim Waugh]

commit 3f6b7b8c0cea63b93a5ed48ecf3909f50f002d18
Merge: 16a8589 45c0f3b
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jan 12 15:39:13 2011 +0000

    Merge branch 'f13' into f14

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