[kdeadmin/f14/master: 4/4] Merge remote-tracking branch 'origin/master' into f14

[Rex Dieter]

commit 520d49f54d8ff21d2646fd7f14697614bc7d6c47
Merge: 44991fb dbb7f57
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 9 10:09:25 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14

 .gitignore                                 |    2 +-
 kdeadmin-4.6.2-kcmprinter_root_privs.patch |   14 ++++++++++++++
 kdeadmin.spec                              |   19 +++++++++++++------
 sources                                    |    2 +-
 4 files changed, 29 insertions(+), 8 deletions(-)
---