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

[Rex Dieter]

commit c6baf96cd6cdfc300f6b31ae9429075ea35aea12
Merge: 6d5f649 a61d08d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 17:55:32 2013 -0600

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

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