[smokekde/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit 3e179351bc207200b53f50c43cf14354b62ede78
Merge: 8682b15 1369539
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 5 08:13:51 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	smokekde.spec
    	sources

 .gitignore    |    3 +--
 smokekde.spec |   30 ++++++++++++++++++++++++------
 sources       |    2 +-
 3 files changed, 26 insertions(+), 9 deletions(-)
---