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

[Jiří Popelka]

commit 4b337bf9ca911fc6f2f8ab31210a0d690bc307c1
Merge: b2ad8e6 e40f779
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Sep 6 17:43:09 2011 +0200

    Merge branch 'f14' into f15

 hplip-sane-crash.patch |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
---