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

[Tim Waugh]

commit 11e74b012f1a88d46c55bf726c295a7e670a8cc3
Merge: 40d5512 917d744
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 7 16:11:48 2011 +0100

    Merge branch 'f15' into f16

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