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

[Jiří Popelka]

commit b2ad8e6a183fb075cbd2293b50e935f2ef344890
Merge: 1cf6962 e6b6030
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Sep 6 17:12:08 2011 +0200

    Merge branch 'f14' into f15

 hplip.spec |    9 ++++++++-
 sources    |    1 -
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc hplip.spec
index 19303be,523e3b2..2b3a0a9
--- a/hplip.spec
+++ b/hplip.spec
@@@ -34,8 -32,8 +34,9 @@@ Patch17: hplip-deviceIDs-ppd.patc
  Patch18: hplip-skip-blank-lines.patch
  Patch19: hplip-dbglog-newline.patch
  Patch20: hplip-no-system-tray.patch
 +Patch21: hplip-cups15.patch
  Patch22: hplip-ppd-ImageableArea.patch
+ Patch23: hplip-sane-crash.patch
  Patch25: hplip-raw_deviceID-traceback.patch
  Patch26: hplip-UnicodeDecodeError.patch
  Patch27: hplip-emit-SIGNAL.patch