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

[Jiří Popelka]

commit 68e2ab105e0d569fd8939051991712b528fb8c4c
Merge: 5e3cc2a ffcb74d
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Sep 20 10:14:47 2012 +0200

    Merge branch 'f16' into f17

 hplip-IEEE-1284-4.patch |   23 +++++++++++++++++++++++
 hplip.spec              |    8 +++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---