[kdeadmin/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 915ebdb655f2e5ea27022fad8ee87336f60df960
Merge: 776d578 45f53b5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:16:12 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdeadmin.spec
    	sources

 .gitignore    |    3 +-
 kdeadmin.spec |   59 ++++++++++++++++++++++++++++++++++++++------------------
 sources       |    2 +-
 3 files changed, 42 insertions(+), 22 deletions(-)
---