[kdeadmin/f17: 9/9] Merge branch 'f18' into f17

[Rex Dieter]

commit c132dfe645377a17a39ffff5b232a21e6585ce67
Merge: 2ae298b c4468d0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 09:13:32 2013 -0600

    Merge branch 'f18' into f17

 .gitignore                                 |    1 +
 kdeadmin-4.6.2-kcmprinter_root_privs.patch |   14 -
 kdeadmin-4.7.1-printing.patch              |  420 ----------------------------
 kdeadmin.spec                              |   72 ++----
 sources                                    |    2 +-
 5 files changed, 23 insertions(+), 486 deletions(-)
---