[hplip/f15: 2/2] Merge branch 'f14' into f15

[Tim Waugh]

commit 917d744aded5871a62d8bfb6e32907e642dd4921
Merge: 96cd1a1 35ff56e
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 7 16:11:39 2011 +0100

    Merge branch 'f14' into f15

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