[kdeadmin/f16: 3/3] Merge branch 'f17' into f16

[Rex Dieter]

commit 63d2b5f3d9821b8dfdf0673293aba2fc5b735ac2
Merge: 9a2bb74 844aeda
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:16:12 2012 -0500

    Merge branch 'f17' into f16

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