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

[Tim Waugh]

commit 2652744294f11b7c88eb53fb43846a2a2800a767
Merge: a2a49be d24c4bb
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Oct 18 15:34:48 2011 +0100

    Merge branch 'f15' into f16

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