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

[Tim Waugh]

commit d24c4bb375b2189d4892b36aa45aab5ffca14032
Merge: 67034ca 44430bd
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Oct 18 15:34:46 2011 +0100

    Merge branch 'f14' into f15

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