[kde-runtime/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit eede33a873169eb863989137d7774557197d7d81
Merge: 9981344 0ba52e2
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:28:33 2012 +0100

    Merge branch 'f18' into f17

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