commit 8bea02b71d830fd1dfd7ad76649f4b0575100acd Merge: 3a6a6a9 2a5d2d9 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Jun 7 20:19:14 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kdesdk.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) ---