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

[Jiří Popelka]

commit fb911627aa047a352594116a6bab84b8cd3453d2
Merge: 3ca4d52 3ecf8ce
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Jan 18 19:14:26 2012 +0100

    Merge branch 'f15' into f16

 hplip-deviceIDs-drv.patch |   20 +++++++++++++++++++-
 hplip.spec                |   18 +++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)
---