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

[Rex Dieter]

commit 8dd82dc14f559c1a32f160484f3ce8235ece604c
Merge: 3e17935 61c54fd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 18:17:07 2012 -0500

    Merge branch 'f18' into f17

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