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

[Tim Waugh]

commit 902b9528d6c88fb469dd38e58b73be7b62cca1dd
Merge: b665a14 bf45cf1
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 1 12:21:38 2010 +0100

    Merge branch 'f13' into f14

 system-config-printer-device-id-msg.patch |   21 +++++++++++++++++++++
 system-config-printer.spec                |   10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---