[hplip/f16: 3/3] Merge branch 'f15' into f16

[Tim Waugh]

commit 4439b572b376d15ac1dca43b09cd4ce6571e020f
Merge: a915c81 6e8c4b0
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 18 17:05:46 2011 +0100

    Merge branch 'f15' into f16

 hplip-CVE-2011-2722.patch |   21 +++++++++++++++++++++
 hplip.spec                |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---