[smokekde/f16: 11/11] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit df77351341f20cc89df2e1f055216010b5c13c56
Merge: 76b770f 666d7ae
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 22:36:04 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	smokekde.spec
    	sources

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