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

[Jiří Popelka]

commit 057904cb4ad490ccd25a5b1f3544f6402567e04b
Merge: aa7a7f1 1176d17
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jan 17 17:37:37 2011 +0100

    Merge branch 'f13' into f14

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 system-config-printer-1.2.5.tar.xz.sig             |  Bin 65 -> 0 bytes
 system-config-printer-1.2.6.tar.xz.sig             |  Bin 0 -> 64 bytes
 ...onfig-printer-InstallPrinterDrivers-debug.patch |   43 --------------------
 system-config-printer-NPTLpdQueue.patch            |   25 -----------
 system-config-printer-compiz-rename.patch          |   11 -----
 system-config-printer-mfg-mdl.patch                |   21 ----------
 system-config-printer-uint32.patch                 |   26 ------------
 system-config-printer.spec                         |   35 +++++-----------
 10 files changed, 13 insertions(+), 151 deletions(-)
---