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

[Rex Dieter]

commit 1694f53e5e76296f536a3602171a889ab7bf4d52
Merge: 2168be4 8682b15
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 12:39:30 2012 -0500

    Merge branch 'f17' into f16

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