[hplip/f16: 3/3] Merge branch 'f15' into f16

[Jiří Popelka]

commit 5a1ba5badd68f54e163d7052f3de0c7497224629
Merge: c43cf0e b2ad8e6
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Sep 6 17:13:21 2011 +0200

    Merge branch 'f15' into f16

 hplip.spec |    9 ++++++++-
 sources    |    1 -
 2 files changed, 8 insertions(+), 2 deletions(-)
---