[system-config-printer/f14/master: 2/2] Merge branch 'f13' into f14

[Jiří Popelka]

commit 434e8ccdc9883dd9a184ceb808ae1513127e875b
Merge: e46f501 4e8d26a
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Feb 9 17:15:52 2011 +0100

    Merge branch 'f13' into f14

 .gitignore                                 |    1 +
 sources                                    |    2 +-
 system-config-printer-1.2.6.tar.xz.sig     |  Bin 64 -> 0 bytes
 system-config-printer-1.2.7.tar.xz.sig     |  Bin 0 -> 65 bytes
 system-config-printer-dnssd-URI.patch      |   12 ------
 system-config-printer-duplicate-PPDs.patch |   57 ----------------------------
 system-config-printer-ungrab-focus.patch   |   11 -----
 system-config-printer.spec                 |   22 ++++-------
 8 files changed, 10 insertions(+), 95 deletions(-)
---