[kdeadmin/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 74426544ca3677258434ef519e83bfab658d8af1
Merge: 915ebdb dc7cf70
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:57:33 2012 -0500

    Merge branch 'master' into f16

 .gitignore    |    1 +
 kdeadmin.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---