[hplip: 3/4] Merge branch 'f17' into f18

[Jiří Popelka]

commit 20c5dd0c31c61a50c9fc3a744261923777dc6ee9
Merge: 88afb24 d3f405f
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Sep 24 14:39:39 2012 +0200

    Merge branch 'f17' into f18

 hplip-notification-exception.patch |   18 +++++-------------
 hplip.spec                         |    5 ++++-
 2 files changed, 9 insertions(+), 14 deletions(-)
---