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

[Tim Waugh]

commit db390b63b440f650396173c665a23aad84b6c23c
Merge: 734e7b7 0356674
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Mar 31 18:00:22 2011 +0100

    Merge branch 'f14' into f15

 .gitignore               |    1 +
 hplip-3.11.3.tar.gz.asc  |    7 -------
 hplip-3.11.3a.tar.gz.asc |    7 +++++++
 hplip.spec               |    5 ++++-
 sources                  |    2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)
---