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

[Than Ngo]

commit 85ffa7128b2fb829aa4408ceeddf59c8bfc3e9e5
Merge: 17716f4 347c3df
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:29:38 2012 +0100

    Merge branch 'f18' into f17

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