[kdesdk/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit fec0ba22bfc8f1b59388d442a8847f00c0dd7191
Merge: 8bea02b 529f906
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 13:25:23 2012 -0500

    Merge branch 'f17' into f16

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