[kdeadmin/f18: 8/8] Merge branch 'master' into f18

[Than Ngo]

commit c4468d0966755be03d3e233e1a11384c4b185c48
Merge: 1ffd2cf 1651514
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 17:24:43 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdeadmin.spec
    	sources

 .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(-)
---
diff --cc .gitignore
index 7f1de6b,a51ecc4..04a7a96
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kdeadmin-4.8.5.tar.xz
 +/kdeadmin-4.9.1.tar.xz
 +/kdeadmin-4.9.2.tar.xz
 +/kdeadmin-4.9.3.tar.xz
 +/kdeadmin-4.9.4.tar.xz
 +/kdeadmin-4.9.5.tar.xz
+ /kdeadmin-4.10.1.tar.xz