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

[Tim Waugh]

commit 29e23831e75e4134df015fdf6645ee0fb7830417
Merge: 5400f18 2bc4b4d
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 15 09:51:04 2010 +0100

    Merge branch 'f13' into f14

 ...onfig-printer-InstallPrinterDrivers-debug.patch |   43 ++++++++++++++++++++
 system-config-printer-mfg-mdl.patch                |   21 ++++++++++
 system-config-printer.spec                         |   18 ++++++++-
 upstream-key-pysmbc.gpg                            |   30 ++++++++++++++
 4 files changed, 111 insertions(+), 1 deletions(-)
---