[hplip/f19: 2/2] Merge branch 'f18' into f19

[Jiří Popelka]

commit 6944f554b5bcf6901c5239d2cbdd3df89d7c66ce
Merge: 75066ab 9e9b5ea
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Mar 15 19:16:43 2013 +0100

    Merge branch 'f18' into f19

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