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

[Tim Waugh]

commit 03e2bb5a93b51c15de6f6c55cd88997271359338
Merge: c1c52b8 f106c64
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Jan 17 17:23:27 2011 +0000

    Merge branch 'f14'

 hplip-CVE-2010-4267.patch |   12 ++++++++++++
 hplip.spec                |   11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---