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

[Tim Waugh]

commit 3ca4d5235f50c8604c08a813370030cfce0d47f4
Merge: 1eed8ce 9ae4f5d
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jan 11 13:12:35 2012 +0000

    Merge branch 'f15' into f16

 copy-deviceids.py |   40 +++++++++++++++++++++-------------------
 hplip.spec        |    6 +++++-
 2 files changed, 26 insertions(+), 20 deletions(-)
---