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

[Tim Waugh]

commit 5400f18737a6196cbc5d43fb73138febf632fc2e
Merge: 902b952 0464892
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Oct 13 13:43:38 2010 +0100

    Merge branch 'f13' into f14

 .gitignore                                |    1 +
 sources                                   |    2 +-
 system-config-printer-1.2.4.tar.xz.sig    |  Bin 65 -> 0 bytes
 system-config-printer-1.2.5.tar.xz.sig    |  Bin 0 -> 65 bytes
 system-config-printer-device-id-msg.patch |   21 -
 system-config-printer-translations.patch  |39332 -----------------------------
 system-config-printer.spec                |   36 +-
 7 files changed, 28 insertions(+), 39364 deletions(-)
---