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

[Jiří Popelka]

commit 904ab64f8132d206bf8f37b19de64ef9caa8214b
Merge: 60be1e4 7c541e5
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Sun Oct 24 19:32:57 2010 +0200

    Merge branch 'f13' into f14

 system-config-printer-NPTLpdQueue.patch |    2 +-
 system-config-printer.spec              |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---