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

[Rex Dieter]

commit 9a2bb749935d16d768165895de8814a55a787a72
Merge: 7442654 a624581
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:55:34 2012 -0500

    Merge branch 'master' into f16

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