[system-config-printer: 2/2] Merge branch 'f16'

[Tim Waugh]

commit 28b8a9f72aef444c0f1ed0a49d957b213dc6246c
Merge: 9b9dd4d ec0fc2f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Oct 5 18:49:09 2011 +0100

    Merge branch 'f16'

 .gitignore                               |    1 +
 sources                                  |    2 +-
 system-config-printer-1.3.6.tar.xz.sig   |  Bin 280 -> 0 bytes
 system-config-printer-1.3.7.tar.xz.sig   |  Bin 0 -> 280 bytes
 system-config-printer-hp-scannable.patch |   30 ------------------------------
 system-config-printer.spec               |   21 ++++++++++++++++++++-
 6 files changed, 22 insertions(+), 32 deletions(-)
---