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

[Tim Waugh]

commit f106c64c717fc1022c11811f2c73e6a967cc6610
Merge: 8f5a3bc 8073848
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Jan 17 17:23:03 2011 +0000

    Merge branch 'f13' into f14

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