[hplip: 5/5] Merge branch 'f16'

[Tim Waugh]

commit 24ddd6ae9774dfc0c8016e1026a248a5e60abb38
Merge: 73e3115 2652744
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Oct 18 15:34:52 2011 +0100

    Merge branch 'f16'

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