[system-config-printer: 3/3] Merge branch 'f14'

[Jiří Popelka]

commit 42871f4584a9efb54f1d7bd16f6aed108df6b60e
Merge: f051aec 60be1e4
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Oct 22 11:33:01 2010 +0200

    Merge branch 'f14'

 system-config-printer-NPTLpdQueue.patch |   25 +++++++++++++++++++++++++
 system-config-printer.spec              |    9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---