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

[Tim Waugh]

commit b8c7ef01a04a6fc3410e354543689e024203f163
Merge: f09b7be df693a7
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Dec 2 16:16:30 2010 +0000

    Merge branch 'f13' into f14

 system-config-printer-compiz-rename.patch |   11 +++++++++++
 system-config-printer.spec                |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---