[hplip: 3/3] Merge branch 'f14'

[Jiří Popelka]

commit 58f0255b13051a5c350d3e6cde9c575af77b1b10
Merge: 491f6d7 fdf7314
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Jan 5 12:56:08 2011 +0100

    Merge branch 'f14'

 hplip-notification-exception.patch |   23 +++++++++++++++++++++++
 hplip.spec                         |    9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---