[kdeadmin/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit dc8bfca62d9313ad587e15af351e86b177215768
Merge: 44e31c0 b7e83b2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:58:07 2012 -0500

    Merge branch 'f18' into f17

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